dud changes to be overwritten
Merge branch 'master' of https://github.com/JonathanBauer/HarryTheKangaroo

Conflicts:
	ProjectSettings/QualitySettings.asset