convert haml
category management
Merge pull request #7 from vaibhavcisin274/vaibhav

Vaibhav
change in task module-29
edit profile
Merge pull request #9 from vaibhavcisin274/dinshaw

edit profile
Update Gemfile

remove extra debugger
merge anshul with master
remove conflict from master
conflicts solve
Merge pull request #6 from vaibhavcisin274/poonam

Poonam
changes in application controller