Merge branch 'gh-pages'
made one column new site update.
Merge branch 'master' into gh-pages