revert
Merge remote-tracking branch 'upstream/dev' into dev
removed .idea
Merge pull request #17 from ivanStraltsou/dev

removed .idea, fixed .gitignore