Proper level progression and reset implemented.
Merge branch 'master' into jason

Conflicts:
	GGJ14/Assets/Scripts/LevelController.cs