new upstream and .gitignore completed