main_settings added
Merge branch 'master' of https://github.com/turboNinja2/Software
l