initial commit
solved merge conflicts
gitignore .idea
ignored .idea