Merge branch 'master-bu' into dm-working
Merge branch 'master' into dm-working
refactored method names
Merge branch 'dm-working'
added a check to ensure user is a student
Merge branch 'dm-working'