First commit
Remove spurious file
Fix merge conflict in .gitignore