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

Conflicts:
	FantasyFight/FantasyFight.vcxproj
	FantasyFight/FantasyFight.vcxproj.filters