permissions module
Merge branch 'master' of https://github.com/eswalker/cos333

Merge permissions module with updated views
import permissions in views