Merge branch 'dev' of github.com:sergelerator/myrubywarrior into dev
Merge branch 'dev'