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

Conflicts:
	first/first.cpp