gameflow
Merge branch 'master' of github.com:fishtopher/GameJam2014

Conflicts:
	Assets/Scripts/Game/Menu/LevelEnd.cs
	Assets/Scripts/Player.cs