subjects controller
Merge branch 'master' of github.com:mjcdiggity/hack