code done
added category name also
Merge branch 'master' into shrey-nutrition