Merge branch 'gh-pages'
twitter added
Merge branch 'master' into gh-pages