Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorrtrimana <rtrimana@uci.edu>
Wed, 3 Aug 2016 00:04:53 +0000 (17:04 -0700)
committerrtrimana <rtrimana@uci.edu>
Wed, 3 Aug 2016 00:04:53 +0000 (17:04 -0700)

Trivial merge