cloud scale stuff
Merge branch 'master' of github.com:simerlec/aic_websocket

Conflicts:
	src/main/java/twitter/SentAnalysis.java