i dont remember
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/scripts/Game.js