Settings

Initial settings activity.
Resolved conflict again.