Started putting in settings
Merge pull request #17 from billheys92/settings-activity

Started putting in settings