Person Controller started, ignore user preferences
Selection
Merge remote-tracking branch 'origin/master'

Conflicts:
	LD30 Unity/Assets/Scripts/PlayerController.cs
	LD30 Unity/Assets/Sounds.meta
	LD30 Unity/Assets/Sounds/Complete_Loop_No_Silence.ogg.meta