canonical and meta desc
Merge branch 'master' of github.com:chriswaugh/chriswaugh.github.io
canonical and meta