Now merges quadrants. PROPERLY. I SWEAR.
EVERYTHING IS FIXED FOREVER I'M THE BEST
Dave forgot to comment some things out. I'M STILL THE BEST #HACKATHON
Merge branch 'master' into drawing

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