Please let this work

sigh
Merge branch 'master' of https://github.com/alexupton/Titans1

Conflicts:
	Titans/TitansContent/TestMap.bmp
	Titans/TitansContent/TitansContent.contentproj