fixed one typo
Merge remote-tracking branch 'upstream/master'

New project structure; templates moved from views to assets
Merge remote-tracking branch 'upstream/master'

Updating with ETS version
Set a law_student instance variable in AcademicsModule, so that will hopefully be able to use in other models
more if statement checks in my_academics models
Merge remote-tracking branch 'upstream/master'

Merging most recent ets changes
Merge branch 'master' of https://github.com/ets-berkeley-edu/calcentral
commented out my changes; weren't working as intended. Will need to rethink some more
commiting newest ETS changes
moved law_student check to user_specific_model.rb
on ubuntu vm
fixing merge issues
fixing merge issue
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
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
made changes to what happens if law_student
merging new ets changes