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

Conflicts:
	Init Direct3D.vcxproj.filters
Fixed positions