Added gitignore
Fixed merge