Ignored the .idea folder
Merge branch 'master' of github.com:DimitarUzunov/conquer-fmi