Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Wed, 25 Jul 2018 23:10:52 +0000 (16:10 -0700)
committerrtrimana <rtrimana@uci.edu>
Wed, 25 Jul 2018 23:10:52 +0000 (16:10 -0700)

Trivial merge