test 2
Merge branch 'master' of github.com:arsen-melkumiants/paint-war