Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic
authorrtrimana <rtrimana@uci.edu>
Thu, 17 Jan 2019 18:11:34 +0000 (10:11 -0800)
committerrtrimana <rtrimana@uci.edu>
Thu, 17 Jan 2019 18:11:34 +0000 (10:11 -0800)

Trivial merge