Merge branch 'master' of https://github.com/subbarao/herokuapp

* 'master' of https://github.com/subbarao/herokuapp:
  removing .idea files from .gitignore
Removed unused code
Merge branch 'master' of https://github.com/subbarao/herokuapp

* 'master' of https://github.com/subbarao/herokuapp: