Merge branch 'master' of https://github.com/ChrisHorrigan/FinalProjRepo

Conflicts:
	FinalProject/Assets/GameLevel.unity