Merge branch 'master' into dm-working
fix display
Merge branch 'expirmental-refactor' into dm-working
Merge branch 'dm-working' into expirmental-refactor
Refactoring: changed AudioLesson to Lesson and LessonTopic to Topic
view fix
Merge branch 'expirmental-refactor' into dm-backup
stash
Added LessonStatus scaffold
Merge branch 'dm-backup' into dm-working
lesson can marked complete from Lesson page
displays lesson status and seeded lesson statuses
Merge branch 'dm-working'
Merge branch 'master' into dm-bu
Merge branch 'dm-bu' into dm-working
added isInstructor? and isStudent? methods
stash
Removed Progress class
Merge branch 'dm-cleanup' into dm-working
Merge branch 'dm-working'