before merge
Merge branch 'master' of https://github.com/Happyness/nodescrabble

Conflicts:
	public/game.js