Merge pull request #1 from mrome007/master

updatefrepo
show the weapon before placement with radius
Merge pull request #12 from Pekklectic/master

Merge pull request #1 from mrome007/master
Added some butts

buttons++ #10
quick changes
some changes
gui
getting things back
Merge pull request #13 from Pekklectic/master

updating fork
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
reverting it back
Update GUI.cs
Update GUI.cs
missile changes
Merge branch 'master' of https://github.com/mrome007/cs179ProjectVer1

Conflicts:
	Assets/Scripts/GUI.cs
Samplehealthb

sample