CNAME: gordontang.ca
Merge branch 'master' into gh-pages