CC manual update
Merge branch 'master' of http://github.com/deathprogramming/deathprogramming.github.io