pulling in changes from ubuntu vm
Merge branch 'master' of github.com:greytoyota/calcentral

Merging changes
moved law_student pass from class initialization to merge method; was getting error despite changing initialization in AcademicsModule