fixes some cp1 and cp2 exercises
Merge branch 'master' of https://github.com/316way/316way-exercises