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

Conflicts:
	_build/doctrees/anchor_texts.doctree
	_build/doctrees/environment.pickle
	_build/doctrees/index.doctree
	_build/doctrees/references.doctree
	_build/doctrees/year_1.doctree
	_build/doctrees/year_2.doctree
	_build/doctrees/year_3.doctree
	_build/doctrees/year_4.doctree