commit
Merge branch 'master' of https://github.com/JonathanBauer/HarryTheKangaroo

Conflicts:
	Assets/Meshes/Materials/lambert2.mat
	Assets/Meshes/Materials/lambert2.mat.meta