continued mucking around with views
fixed merge conflicts
Merge branch 'develop' of github.com:CH-JesseMa/karma_app into develop