Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Tue, 24 Jul 2018 18:01:12 +0000 (11:01 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 24 Jul 2018 18:01:12 +0000 (11:01 -0700)

Trivial merge