Ammended for issue #4
Merge branch 'master' of ssh://github.com/WheresMyTeacher/WheresMyTeacher