sdfsf
Merge branch 'master' of https://github.com/beiguoqishi/HoldOffer

Conflicts:
	Classes/Player.cpp