change settings
Merge branch 'master' of github.com:rivnefish/rivnefish