updating gitignore
stupid merge fix