Some general stuff
Merge branch 'master' of github.com:enplotz/graph_zahl
Reinclude CIA
Merge remote-tracking branch 'refs/remotes/Manu/master'

Conflicts:
	presentation/include/01_general.tex