accidentally committed to local settings branch. but oh well. removed rest of settings, and restructured app
Merge branch 'settings' into dev