Fixed merging problems
Merge branch 'master' of ssh://git@github.com/WheresMyTeacher/WheresMyTeacher.git