Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Fri, 1 Dec 2017 23:36:30 +0000 (15:36 -0800)
committerrtrimana <rtrimana@uci.edu>
Fri, 1 Dec 2017 23:36:30 +0000 (15:36 -0800)

Trivial merge