I'll just try to clean it up.
Forced commit by git
Merge branch 'master' of https://github.com/Xrave/CourseSurfer