Fixed the .gitignore file

.gitignore had remnants of past merge conflicts.
Merge pull request #21 from Bl-nK/fixGitIgnore

Fixed the .gitignore file

Thanks for the tidy.