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

Conflicts:
	FantasyFight/Header/Character.h
	FantasyFight/Source/Character.cpp
First turn stable! :-D