mod conf.py for rst2pdf
Merge branch 'master' of github.com:ghoulmann/cs-curriculum

Conflicts:
	conf.py