awkasjdkl
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
asdsad
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/scripts/Player.js