Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
added permalinks
merged something....
merged something else...