Fixed the .gitignore file
Merge conflicts
working on .gitignore file stupidities
merging conflicts