Updated files
Merge branch 'master' of https://github.com/skimdog/Creature-Trainer

Conflicts:
	PrintHelper.cpp