changed gitignore to not ignore IDE files anymore
Merge branch 'gitignore'