Task 1: unroll.
Merge branch 'Johnie-z-rest_courses'

Conflicts:
	modules/rest/index.php
Merge pull request #36 from Johnie-z/master

Task: unenroll.