City Generation 2 with Fire
City Generation 2 With Fire
Merge branch 'master' of https://github.com/thepostalworker/collateralDisaster

Conflicts:
	.gitignore
	Assets/Prefabs/Building Cylinder.prefab
	Assets/Prefabs/Building Cylinder3.prefab
	Assets/Prefabs/Building Sphere.prefab
	Assets/Prefabs/Building Sphere2.prefab
	Assets/Prefabs/Building Tile 1.prefab
	Assets/Prefabs/Building Tile 2.prefab
	Assets/Prefabs/Building Tile 3.prefab
	Assets/Prefabs/StreetPlane.prefab
	Assets/Prefabs/Wall.prefab
	Assets/levels/Test Street generation.unity
	ProjectSettings/ProjectSettings.asset
	ProjectSettings/TagManager.asset