Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authortkwa <kwathomas0@gmail.com>
Wed, 3 Aug 2016 18:03:38 +0000 (11:03 -0700)
committertkwa <kwathomas0@gmail.com>
Wed, 3 Aug 2016 18:03:38 +0000 (11:03 -0700)

Trivial merge