updated the settings screen
Merge branch 'master' of https://github.com/zackhall/CapstoneProject