add timeline
Merge branch 'master' of github.com:VictorTpo/the_little_mouse

Conflicts:
	platform/app/views/course_checkpoints/course_checkpoints.js.erb
	platform/app/views/courses/show.html.erb