hm, conflict
Merge branch 'master' of github.com:ghoulmann/cs-curriculum

Conflicts:
	_build/doctrees/LICENSE.doctree