fix user index view
Merge branch 'master' of github.com:CH-JesseMa/karma_app
fix index user view
resolve merge issue
views
Merge branch 'develop'
Merge branch 'master' of github.com:CH-JesseMa/karma_app
Merge branch 'develop'
add admin test
fixed merge conflict
added css to welcome page
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop