Рефакторинг
merge + begin client
Merge branch 'master' of https://github.com/forsaken1/game