king now gloriously explodes
Merge branch 'master' of github.com:poemdexter/IndieSpeedRun2013

Conflicts:
	Assets/scenes/Game.unity