Merge branch 'dev' into gh-pages
Merge branch 'gh-pages' of https://github.com/igdesign/canadian-pairs into gh-pages