added the settings page
fix conflicts
merge
Merge pull request #365 from colkito/feature/settings-page

Feature/settings page