Add caption to confusion
fix merge
Merge branch 'master' of github.com:xldenis/proj2