change for fight
Merge branch 'develop' of https://github.com/flppyCode/test-client into develop

Conflicts:
	first/first.cpp