Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorjoelbandi <joelvivekbandi@gmail.com>
Tue, 2 Aug 2016 22:47:35 +0000 (15:47 -0700)
committerjoelbandi <joelvivekbandi@gmail.com>
Tue, 2 Aug 2016 22:47:35 +0000 (15:47 -0700)

Trivial merge