Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Sat, 19 Jan 2019 01:57:59 +0000 (17:57 -0800)
committerrtrimana <rtrimana@uci.edu>
Sat, 19 Jan 2019 01:57:59 +0000 (17:57 -0800)

Trivial merge