merge master to gh-pages
merged master