SettingsViewController Finished!
2 Settings Pages Condensed Into One
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By Ben-G
# Via Ben-G
* 'master' of https://github.com/koroket/MKSTFA:
  completed Code Review IV