update to settings
Merge branch 'master' of https://github.com/VerUltimus/fe-arena