Adding grid
asd;lkfjasd;lkfja;lksdjf;lkads <- hackathon commit message
Merge branch 'master' into drawing

Conflicts:
	app/assets/javascripts/game.js.coffee