Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorbdemsky <bdemsky@uci.edu>
Sun, 24 Jul 2016 08:11:54 +0000 (01:11 -0700)
committerbdemsky <bdemsky@uci.edu>
Sun, 24 Jul 2016 08:11:54 +0000 (01:11 -0700)

Trivial merge