Commiting some things so I can get some things
Merge branch 'master' of https://github.com/Geekpenguin/SciFighters

Conflicts:
	Assets/Terrain Assets/Materials/Forest Floor.mat.meta
	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/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/81/81bd90dff5c0bb9489091e7c17514222
	Library/metadata/be/be7496f76140a5a47900ab2e9b5211a8
	SciFighters.userprefs