Show correct progress
Merge branch 'master' of github.com:schfkt/coursehub

Conflicts:
	app/views/courses/show.html.slim