student and entry views
Merge branch 'master' of github.com:bwhthd/Journal