settings page work
Merge branch 'master' of github.com:mbatilando/collegeHackathon

marge