publishing
rm ~s
Merge branch 'gh-pages'