Merge branch 'master' of https://github.com/Superfluoushype/2csc148

Conflicts:
	course_test.py