Added .idea
Merge branch 'master' of https://github.com/Pirdod/MoneyTracker
Merge branch 'develop'

Master had different commits while develop had different commits.
They need to be merged before things got out of hand.
removed the iml files so they don't get tracked by git locally.