Remove conflict lines from gitignore
Merge pull request #39 from bettse/bettse/gitignore_conflict

Remove conflict lines from gitignore