updating gitignore
merging upstream