Pulling
Merge branch 'master' of https://github.com/Kranchy/Looter
Merging
Merge branch 'master' of https://github.com/Kranchy/Looter

Conflicts:
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Project-csharp.sln
	Project/Project.sln