Added lightning switch and an elevator (that doesn't work yet)
Merge branch 'master' of github.com:jquinn630/DrProf

Conflicts:
	NickyRage/Assets/MainScene.unity
	NickyRage/Assets/Scripts/MovePlayer.cs
	NickyRage/Library/CurrentLayout.dwlt
	NickyRage/Library/InspectorExpandedItems.asset
	NickyRage/Library/ScriptAssemblies/Assembly-CSharp.dll
	NickyRage/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	NickyRage/Library/assetDatabase3
	NickyRage/Library/expandedItems
	NickyRage/Library/guidmapper
	NickyRage/Library/metadata/2f/2fdd104defc3d44fb9aa6bfd1522ffc8
	NickyRage/NickyRage-csharp.sln
	NickyRage/NickyRage.sln
	NickyRage/NickyRage.userprefs