CSE-89: UI and app sided part of settings basically done... still need to do the part saved on the database
Merge branch 'master' of https://github.com/noahsmartin/CSE110