Weapon I guess

Currently empty
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore

	sourcefiles/GXPEngine/obj/x86/Debug/GXPEngine.csproj.FileListAbsolute.txt