added settings page
Merge branch 'master' of github.com:brownhead/cs166_project