pre-Pull
pre-Pull
pre-Pull
Merge branch 'master' of https://github.com/ErPanfi/FantasyFight

Conflicts:
	FantasyFight/Source/Printable.cpp
resolved some warnings