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

Conflicts:
	_build/doctrees/environment.pickle
	_build/html/searchindex.js
LICENSE image from CC fixed
working with cover