lol watch out for the blur class!
Merged some stuff in.

Merge branch 'master' of https://github.com/Xrave/CourseSurfer