Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorBrian Demsky <bdemsky@plrg.eecs.uci.edu>
Sat, 23 Jul 2016 02:08:06 +0000 (19:08 -0700)
committerBrian Demsky <bdemsky@plrg.eecs.uci.edu>
Sat, 23 Jul 2016 02:08:06 +0000 (19:08 -0700)

Trivial merge