new map wooot
Merge branch 'master' of github.com:SurrenderMonkeys/sm-gamecraft-2013

Conflicts:
	src/game.js
	src/playerComponent.js