adds new files
Merge upstream/gh-pages