prepull
Merge branch 'master' of https://github.com/ErPanfi/FantasyFight

Conflicts:
	FantasyFight/Header/MyString.h
post-rename