WIP
Merge branch 'master' of https://github.com/aaronshaf/canvas-for-kids

Conflicts:
	stylesheets/_course.scss