Forgot what I was doing
Commit
Merge branch 'local'

Conflicts:
	course.php
Merge branch 'master' of https://github.com/dscourse/public