Fixed some 'm' shit
Some .iml files added
Merge pull request #2 from shivekkhurana/divyanshusrivastava-develop

Divyanshusrivastava develop + Fixed merge confilicts