Merge branch 'master' of https://github.com/wnstr/ajls-baltimore-clueless into wnstr-master

Conflicts:
	README
	build.xml
	build/WEB-INF/classes/servlets/GameWebSocketServlet$1.class
	build/WEB-INF/classes/servlets/GameWebSocketServlet$ChatMessageInbound.class
	build/WEB-INF/classes/servlets/GameWebSocketServlet.class
	src/servlets/GameWebSocketServlet.java