adding up button to settings activity
Merge branch 'master' of github.com:Jr-Rooster-The-2nd/Chowdown into settings_up_button
Merge pull request #30 from snorham/settings_up_button

Settings up button