Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/iotcloud
authorrtrimana <rtrimana@uci.edu>
Mon, 1 Aug 2016 17:49:20 +0000 (10:49 -0700)
committerrtrimana <rtrimana@uci.edu>
Mon, 1 Aug 2016 17:49:20 +0000 (10:49 -0700)

Trivial merge