final project for cqp
Merge branch 'master' of https://github.com/ffrie/cqp