Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorBrian Demsky <bdemsky@plrg.eecs.uci.edu>
Sun, 24 Jul 2016 22:29:23 +0000 (15:29 -0700)
committerBrian Demsky <bdemsky@plrg.eecs.uci.edu>
Sun, 24 Jul 2016 22:29:23 +0000 (15:29 -0700)

Trivial merge