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

Conflicts:
	Assets/Materials/uvTest.mat
commit