worked on fixing bug with the e cursor disappearing on the air puzzle
Merge branch 'master' of https://github.com/DirkLaserblast/Launch
Re-added the rover pings and generator model.
Merge remote-tracking branch 'origin/master' into AllisonMergeConflicts

Conflicts:
	Launch 3D/Assets/Animations/CuriosityPing.controller
	Launch 3D/Assets/Animations/CuriosityPing.controller.meta
	Launch 3D/Assets/Animations/FinalPing.anim
	Launch 3D/Assets/Animations/FinalPing.controller.meta
	Launch 3D/Assets/Animations/OpportunityPing.anim
	Launch 3D/Assets/Animations/OpportunityPing.controller.meta
	Launch 3D/Assets/Animations/RandomPing.anim
	Launch 3D/Assets/Animations/RandomPing.controller.meta
	Launch 3D/Assets/Animations/SojournerPing.anim
	Launch 3D/Assets/Animations/SojournerPing.controller.meta
	Launch 3D/Assets/Animations/SpiritPing.anim
	Launch 3D/Assets/Animations/SpiritPing.controller.meta
	Launch 3D/Assets/Objects/Generator.blend
	Launch 3D/Assets/Objects/RoverPuzzlePing.blend
	Launch 3D/Assets/Scenes/Alpha Scenes/AlphaBuildScene.unity
	Launch 3D/Assets/Scripts/Puzzle Scripts/Relay Puzzle/MinigameObjectScript.cs
	Launch 3D/Assets/Scripts/Puzzle Scripts/Relay Puzzle/RoverPuzzle.cs
added new menu and maps
added my stuff to the main scene