Beginning of actual map
Merge branch 'master' of https://github.com/specialk1337/COMP476_AdvGameDev

Conflicts:
	ApocalypseWar/Assets/AstarPathfindingProject/ExampleScenes/Example2_Terrain/Pathfinding_Terrain.asset
	ApocalypseWar/Assets/Destroyed_city_FREE/Scenes/Terrain destroyed_city.asset
	ApocalypseWar/Assets/New Terrain.asset