now with working messaging
Merge branch 'master' of github.com:d4-ideas/Roshambattle

Conflicts:
	app.js
	public/js/main.js
	routes/processTurn.js