Initial Commit
Merge branch 'master' of https://github.com/rhuang1/ptown-chance

Conflicts:
	Quartz/Assets/Assets.meta
	Quartz/Assets/Assets/Callback.cs.meta
	Quartz/Assets/Assets/MapNode.cs.meta
	Quartz/Assets/Assets/Messenger.cs.meta
	Quartz/Assets/Materials.meta
	Quartz/Assets/Materials/Basic Grass.mat.meta
	Quartz/Assets/Materials/Basic Gravel.mat.meta
	Quartz/Assets/Materials/Basic Stone.mat.meta
	Quartz/Assets/Materials/Generic Black.mat.meta
	Quartz/Assets/Materials/Generic Green.mat.meta
	Quartz/Assets/Prefabs.meta
	Quartz/Assets/Prefabs/Basic Grass.prefab
	Quartz/Assets/Prefabs/Basic Grass.prefab.meta
	Quartz/Assets/Prefabs/Basic Gravel.prefab.meta
	Quartz/Assets/Prefabs/Basic Stone.prefab
	Quartz/Assets/Prefabs/Basic Stone.prefab.meta
	Quartz/Assets/Prefabs/GenericTerrain.prefab.meta
	Quartz/Assets/Prefabs/SingleGrid.prefab.meta
	Quartz/Assets/Prefabs/TestCube.prefab.meta
	Quartz/Assets/Scripts.meta
	Quartz/Assets/Scripts/BuildingGrid.cs.meta
	Quartz/Assets/Scripts/BuildingManager.cs.meta
	Quartz/Assets/Scripts/CameraController.cs.meta
	Quartz/Assets/Scripts/Health.cs.meta
	Quartz/Assets/Scripts/MapLayoutManager.cs.meta
	Quartz/Assets/Scripts/Temporary.cs.meta
	Quartz/Assets/Scripts/Terrain.cs.meta
	Quartz/Library/metadata/0a/0aefe9adad45e774eb46c0b9aad95cf9
	Quartz/Library/metadata/17/1780e76efd28b1942a6b8535a857810a
	Quartz/Library/metadata/23/23307a4ad4a4d09489ddf72ea791db9e
	Quartz/Library/metadata/23/23c369fca9585834e88a199ebb0bb61b
	Quartz/Library/metadata/2f/2f79921bfaf77484a98b5cf0d5903fec
	Quartz/Library/metadata/40/4035a2d97aa991a44aaaa4150b0c0d59
	Quartz/Library/metadata/46/465eeb86963ce394bb49d66d4021555a
	Quartz/Library/metadata/78/785676dc08c91cb41890e07903e05ae9
	Quartz/Library/metadata/ab/ab1cb460436a8094892dc62a15d8bc5f
	Quartz/Library/metadata/b2/b2e6e921bd2656040ab84ee36a89aeec
	Quartz/Library/metadata/db/dbc71517a5c70f44e8afae85aa6e841c
	Quartz/Library/metadata/ed/edfdfa344ee254a4690bf7710b337979
	Quartz/Library/metadata/f4/f47fbdf89d8469b41865009e8b482fea
	Quartz/ProjectSettings/EditorSettings.asset

Yes