Add .idea to .gitignore
Merge remote-tracking branch 'origin/newlinediff' into newlinediff
fixed some tests