Fixed things due to problems.

Merger caused issues so I reverted back to a previous commit and worked
from there to put my stuff in.
Merge branch 'master' of https://github.com/SunriseBolt/Strategy-Game

Conflicts:
	Strat of the ages/dsf/DXGame.cpp