revertedRevert "Reverted Scenes"

This reverts commit aed0efe48fddc7b1531f0103a2627f50206dc45b.
yepRevert "Merge remote-tracking branch 'origin/master'"

This reverts commit e618b4bccce0f82c527366367031b0d63f8afb89, reversing
changes made to 1849a920c362b4c4ce509f7721f1d1eddf7b16ed.
more Revert "Committing Current Changes for a Pull"

This reverts commit 1849a920c362b4c4ce509f7721f1d1eddf7b16ed.
reverted some commits and fixed some bugs
Prefab Update!

Update to the prefabs and resources contained within the project.
More Gear Models + Slight GUI Change + Rusted Gear

- More of Jimmie's models added to Models folder
- GUI Change, remove border and add BG
- Rusted Gear deletion functionality on turn added
Updated Rusted Gear Behavior + Prefab

Updated Rusted Gear behavior and prefab files
so much merging death
Merge branch 'master' of https://github.com/katherinecykes/gearshift into reverting_stuff

Conflicts:
	GearShift/Assets/Graphics/GUI/Layer1_01.png
	GearShift/Assets/Graphics/GUI/Layer1_01.png.meta
	GearShift/Assets/Graphics/GUI/Materials/Layer1_01.png
	GearShift/Assets/Graphics/GUI/Materials/Layer1_01.png.meta
	GearShift/Assets/Graphics/GUI/Materials/Materials/Toolbox_01.mat
	GearShift/Assets/Graphics/GUI/Materials/Materials/Toolbox_01.mat.meta
	GearShift/Assets/Graphics/GUI/Materials/Materials/gearshift_border_1.mat
	GearShift/Assets/Graphics/GUI/Materials/Materials/gearshift_border_1.mat.meta
	GearShift/Assets/Graphics/GUI/Materials/Toolbox_01.png
	GearShift/Assets/Graphics/GUI/Materials/Toolbox_01.png.meta
	GearShift/Assets/Graphics/GUI/Materials/gearshift_border_1.png
	GearShift/Assets/Graphics/GUI/Materials/gearshift_border_1.png.meta
	GearShift/Assets/Graphics/GUI/Toolbox_01.mat
	GearShift/Assets/Graphics/GUI/Toolbox_01.png
	GearShift/Assets/Graphics/GUI/Toolbox_01.png.meta
	GearShift/Assets/Graphics/GUI/gearshift_border_1.mat
	GearShift/Assets/Graphics/GUI/gearshift_border_1.png
	GearShift/Assets/Graphics/GUI/gearshift_border_1.png.meta
	GearShift/Assets/Graphics/Gears/EndGear/EndGear.mat.meta
	GearShift/Assets/Graphics/Gears/IonGear.meta
	GearShift/Assets/Graphics/Gears/IonGear/IonGear.fbx
	GearShift/Assets/Graphics/Gears/IonGear/IonGear.fbx.meta
	GearShift/Assets/Graphics/Gears/IonGear/Materials.meta
	GearShift/Assets/Graphics/Gears/IonGear/Materials/lambert1.mat
	GearShift/Assets/Graphics/Gears/IonGear/Materials/lambert1.mat.meta
	GearShift/Assets/Graphics/Gears/StandardGear/Materials/blinn1.mat
	GearShift/Assets/Graphics/Gears/_MISC_/Hollow Gear/Hollow Gear.fbx
	GearShift/Assets/Graphics/Gears/_MISC_/Hollow Gear/Hollow Gear.fbx.meta
	GearShift/Assets/Graphics/Gears/_MISC_/Hollow Gear/Materials/lambert1.mat.meta
	GearShift/Assets/Materials/Layer1_01.png
	GearShift/Assets/Materials/Layer1_01.png.meta
	GearShift/Assets/Materials/Materials.meta
	GearShift/Assets/Materials/Materials/Toolbox_01.mat
	GearShift/Assets/Materials/Materials/Toolbox_01.mat.meta
	GearShift/Assets/Materials/Materials/gearshift_border_1.mat
	GearShift/Assets/Materials/Materials/gearshift_border_1.mat.meta
	GearShift/Assets/Materials/Textures/Toolbox_01.mat.meta
	GearShift/Assets/Materials/Textures/gearshift_border_1.mat.meta
	GearShift/Assets/Materials/Toolbox_01.png
	GearShift/Assets/Materials/Toolbox_01.png.meta
	GearShift/Assets/Materials/gearshift_border_1.png
	GearShift/Assets/Materials/gearshift_border_1.png.meta
	GearShift/Assets/Models/Materials.meta
	GearShift/Assets/Models/Materials/gear_01_blinn1.mat.meta
	GearShift/Assets/Models/Materials/ion 1.mat
	GearShift/Assets/Models/Materials/ion.mat
	GearShift/Assets/Models/Materials/lambert1.mat
	GearShift/Assets/Models/Materials/lambert1.mat.meta
	GearShift/Assets/Models/gear_02.fbx
	GearShift/Assets/Models/gear_02.fbx.meta
	GearShift/Assets/Prefabs/IonGear.prefab
	GearShift/Assets/Prefabs/Rusted Gear.prefab.meta
	GearShift/Assets/Prefabs/StandardGear.prefab.meta
	GearShift/Assets/Prefabs/gear_01.prefab.meta
	GearShift/Assets/Scenes/TechDemoV2.unity
	GearShift/Assets/Scripts/GearStates/LockedGearState.cs
Added abstract obstacle class and singleton (to prep for layers)