Committing Current Changes for a Pull

Committing Current Changes for a Pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	GearShift/Assets/Prefabs/Gear 3.prefab
	GearShift/Assets/Prefabs/Gear.prefab
	GearShift/Assets/Scenes/testGui.unity
	GearShift/Assets/Scripts/GearStates/Gear.cs