awwww yeah
Merge branch 'master' of github.com:Geekpenguin/SciFighters

Conflicts:
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/37/3787ce5d00193fd48962124fb39bce91
	Library/metadata/60/6099bcbd1c2004efd921c8e26a0a4400
	Temp/__EditModeScene