Fix stuff
Merge branch 'master' of github.com:AlexHayton/UnityTestProject2

Conflicts:
	Assets/TestProject/Scenes/test.unity
Fixed merge conflicts from earlier.