adds methods to teacher
adds methods
resolves merge conflicts