Merge branch 'master' into gh-pages
contact removed
contact changed
wording
Merge branch 'gh-pages'