Merge branch 'gh-pages'
new touch icon
Merge branch 'master' into gh-pages