He said I needed to commit.
Merge branch 'master' of https://github.com/Neoky/FPS_Project.git

Conflicts:
	.gitignore
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	FPS_Project-csharp.sln
	FPS_Project.sln
	library/CurrentLayout.dwlt
	library/ScriptAssemblies/Assembly-CSharp.dll
	library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	library/assetDatabase3
	library/guidmapper