New statemachinge Stately
Merge branch 'master' of https://github.com/Happyness/nodescrabble

Conflicts:
	public/clientstate.js
	public/game.js
	server.js

Try to merge
Fixed merge
Merge branch 'master' of https://github.com/Happyness/nodescrabble

Conflicts:
	public/game.js