Shop da whooop!
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
naaaaaaa
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013
i lost a battle with fading out the renders
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013

Conflicts:
	public/index.html
	public/scripts/Game.js
made world changing changes
Merge branch 'master' of https://github.com/Dr-Jerm/GlobalGameJam2013