Committing a second time.
Merge branch 'master' of https://github.com/Geekpenguin/SciFighters

Conflicts:
	Assets/Scenes/Test_Levelv3 Collin.unity
	Assets/Scripts/Controls.cs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Library/assetDatabase3
	Library/metadata/be/be7496f76140a5a47900ab2e9b5211a8
	SciFighters.userprefs