starting implementation of all this
adding .idea to .gitignore
removing .idea folder
fix conflicts, merge