Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iot2
authorrtrimana <rtrimana@uci.edu>
Tue, 24 Jul 2018 22:31:37 +0000 (15:31 -0700)
committerrtrimana <rtrimana@uci.edu>
Tue, 24 Jul 2018 22:31:37 +0000 (15:31 -0700)

Trivial merge