build?
Merge branch 'master' of github.com:ghoulmann/cs-curriculum

Conflicts:
	_build/doctrees/LICENSE.doctree
	_build/doctrees/anchor_texts.doctree
	_build/doctrees/collab.doctree
	_build/doctrees/heading.doctree
	_build/doctrees/index.doctree
	_build/doctrees/preface.doctree
	_build/doctrees/references.doctree
	_build/doctrees/year_1.doctree