init commit
git ignore stuff
config i guess
whatever
Merge branch 'feature/db_settings' into develop
merge whatever