First commit
Added gitignore
Conflict