test
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/scripts/controllers/game.js
test
Merge remote-tracking branch 'origin/master'