add docs from new-docs branch
resolve conflict within .gitignore