Some general stuff
Merge branch 'master' of github.com:enplotz/graph_zahl
Reinclude CIA