First commit
Fixed conflict
Added .idea