Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Wed, 23 Jan 2019 22:15:50 +0000 (14:15 -0800)
committerrtrimana <rtrimana@uci.edu>
Wed, 23 Jan 2019 22:15:50 +0000 (14:15 -0800)

Trivial merge