derp
Merge branch 'master' of https://github.com/theprophet31337/ForgottenSchism

Conflicts:
	ForgottenSchism/ForgottenSchism/obj/x86/Debug/ForgottenSchism.csproj.FileListAbsolute.txt
	ForgottenSchism/ForgottenSchism/obj/x86/Debug/ForgottenSchism.exe
	Map Tool/obj/x86/Debug/Map Tool.csproj.FileListAbsolute.txt