Added a settings activity

Resolved a merge conflict