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

Conflicts:
	Init Direct3D.vcxproj
	Init Direct3D.vcxproj.filters
	source/Southfall.h
Fixed solution files
Merge branch 'master' of https://github.com/weaverreaper/Southfall2

Conflicts:
	Init Direct3D.vcxproj
	Init Direct3D.vcxproj.filters
	Southfall3D.v11.suo
Merge branch 'master' of https://github.com/weaverreaper/Southfall2

Conflicts:
	Init Direct3D.vcxproj