changes teacher to instructor
adds methods to teacher
adds methods
resolves merge conflicts
commit
fixed teacher model