Added .idea to ignore file
Updated README
Fix merge conflict with .gitignore