Merge branch '12-instructor-model' into 'master'

Resolve "Add Instructor Model"

Closes #12 and #21

See merge request !23
2 jobs for dev-v2 in 2 minutes and 13 seconds (queued for 1 second)