updated gitignore
initial import
Fixed conflict in .gitignore