Merge branch 'master' of https://github.uci.edu/rtrimana/smart_home_traffic