Adding changes I made to the SettingsScreen
Merge branch 'master' of https://github.com/dawguy/CS2340MULE
Merge