Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authortkwa <kwathomas0@gmail.com>
Sat, 23 Jul 2016 01:14:27 +0000 (18:14 -0700)
committertkwa <kwathomas0@gmail.com>
Sat, 23 Jul 2016 01:14:27 +0000 (18:14 -0700)

Trivial merge