Fixed gitignore for work with IntelliJ IDEA
merge