added .gitignore file
deleted .idea folder
merging