added .gitignore again
merging
trying to update .gitignore again