adding gitignore
initial commit
resolve conflict