Game flow and death
Merge branch 'master' of https://github.com/rbrt/gamejam2014

Conflicts:
	gamejam2014/Assets/scenes/template.unity