updating master to match gh-pages
updating master to match gh-pages