convert haml
category management
conflicts solve
Merge pull request #6 from vaibhavcisin274/poonam

Poonam