sword
Merge branch 'master' of https://github.com/weaverreaper/Southfall2

Conflicts:
	Init Direct3D.vcxproj.filters
	Southfall3D.suo
	source/Southfall.cpp
	source/Southfall.h