Emptying out gh-pages to try to merge again
Re-adding all the files from master. "Manual merge"