Updated Settings portion of app
Syncing up branches

merge branch 'master' of https://github.com/yjm607/CS408--Critter-Friends