Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iot2
authorrtrimana <rtrimana@uci.edu>
Fri, 16 Jun 2017 18:40:14 +0000 (11:40 -0700)
committerrtrimana <rtrimana@uci.edu>
Fri, 16 Jun 2017 18:40:14 +0000 (11:40 -0700)

Trivial merge