some commit
asd
Merge branch 'master' of github.com:Pata94/simple_client_cpp2014

Conflicts:
	include/config.h
	simple_client_cpp.layout
	src/CBaseLogic.cpp
	src/CGameState.cpp
update