getting things back
Merge branch 'master' of https://github.com/mrome007/cs179ProjectVer1

Conflicts:
	Assets/Prefabs/TurretDummy.prefab
	Assets/Prefabs/TurretDummyLv2.prefab
	Assets/Prefabs/TurretDummyLv3.prefab
	Assets/Prefabs/laserTowerDummy.prefab
	Assets/Prefabs/laserTowerDummyLv2.prefab
	Assets/Prefabs/laserTowerDummyLv3.prefab
	Assets/Prefabs/trackingTurretDummy.prefab
	Assets/Prefabs/trackingTurretDummyLv2.prefab
	Assets/Prefabs/trackingTurretDummyLv3.prefab
	Assets/_Scenes/TheGame.unity
scene
Merge branch 'master' of https://github.com/mrome007/cs179ProjectVer1

Conflicts:
	Assets/Prefabs/TurretDummy.prefab
	Assets/Prefabs/TurretDummyLv2.prefab
	Assets/Prefabs/TurretDummyLv3.prefab
	Assets/Prefabs/laserTowerDummy.prefab
	Assets/Prefabs/laserTowerDummyLv2.prefab
	Assets/Prefabs/laserTowerDummyLv3.prefab
	Assets/Prefabs/trackingTurretDummy.prefab
	Assets/Prefabs/trackingTurretDummyLv2.prefab
	Assets/Prefabs/trackingTurretDummyLv3.prefab
	Assets/_Scenes/TheGame.unity
new change
change