commit before pull :)
Merge branch 'master' of https://github.com/specialk1337/COMP476_AdvGameDev

Conflicts:
	ApocalypseWar/ApocalypseWar.userprefs
	ApocalypseWar/Assets/Standard Assets/Character Controllers/Sources/Scripts/ControlPoint.cs
	ApocalypseWar/Assets/Standard Assets/MyPrefabs/ControlPointPreFab.prefab
	ApocalypseWar/Assets/TestScene.unity