Merge branch 'gh-pages'
fix click sound to only come from text
Merge branch 'master' into gh-pages