Removed .idea directory and added it to git ignore
Merge branch 'shrikrishna'