Harpdarp
Merge remote-tracking branch 'origin/Fixed-camera-jan'

Conflicts:
	Assets/levels/progress/CS_Game_Phase1V1.unity
	Assets/levels/progress/CS_Game_Phase2V1.unity
	Assets/levels/progress/CS_Game_Phase3V1.unity
	Assets/prefabs/player/Player.prefab
	Assets/prefabs/player/Player.prefab.meta
	Assets/scripts/player/SphereController.cs