added gitignore
cleaning up gitignore conflict