Merge branch 'master' into emily

Conflicts:
	GGJ14/Assets/Scripts/LevelController.cs
	GGJ14/Assets/Scripts/PlayerControl.cs