creating user dashboard
fixed merge conflicts
created user dashboard
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop