Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Fri, 23 Aug 2019 16:28:27 +0000 (09:28 -0700)
committerrtrimana <rtrimana@uci.edu>
Fri, 23 Aug 2019 16:28:27 +0000 (09:28 -0700)

Trivial merge