added gitignore file
removed the .idea files from repo
merge conflicts resolved
more conflicts