Merge branch 'core' of ssh://plrg.eecs.uci.edu/home/git/iotcloud into core
-rw-r--r-- 1740 .gitignore
drwxr-xr-x - PyORAM
drwxr-xr-x - non_block_chain
drwxr-xr-x - version1
drwxr-xr-x - version2