c++ conformance
Merge branch 'master' of github.com:ohwgiles/quilte