delete .idea folder
Merge branch 'master' of https://github.com/thorsa/cali-project