re commit to get up to date
Merge branch 'master' of https://github.com/ShadeO89/SchoolProject

Conflicts:
	unity/Assets/scripts/ClickToMove.cs