Bring all necessary files from gh-pages into master