Merge pull request #2 from shivekkhurana/develop

Deleted .idea/ and *.iml. Added gitignore conditions to avoid them.