Removed .idea directory from commits and added it to .gitignore. Silly me...
Merge branch 'master' of https://github.com/tomaskala/eLiz