added isInstructor? and isStudent? methods
stash
Removed Progress class
Merge branch 'dm-cleanup' into dm-working