Ignoring stupid files
Added gitignore
Merge fixed