SettingsActivity
Merge branch 'master' of https://github.com/brandonsung92/Android-Weather