Fixed conflicts
Merge branch 'master' of https://github.com/samg2014/TeacherRMH.git