First commit
Added .gitignore
Removed .idea/ files
Merge conflict in .gitignore