Merge branch 'gh-pages'
rm test
touch event
Merge branch 'master' into gh-pages