added new views to the profile settings and mod styling to navbar
updated conflicts and converged the models
Merge pull request #22 from rocketu/implementation-johnny

Implementation johnny
new test for progress/feedback 91%