Merge branch 'gh-pages'
updated tweet button
Merge branch 'master' into gh-pages