Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorjoelbandi <joelvivekbandi@gmail.com>
Fri, 22 Jul 2016 21:28:41 +0000 (14:28 -0700)
committerjoelbandi <joelvivekbandi@gmail.com>
Fri, 22 Jul 2016 21:28:41 +0000 (14:28 -0700)

Trivial merge