Added edit settings option
Merge branch 'master' of github.com:jasonklein/wdi-project-2