Added a settings activity

Resolved a merge conflict
Merge pull request #2 from Naosyth/bw-create-settings-activity

Added a basic settings activity