code
merging code
code
Merge branch 'shrey-reward' of github.com:adlakhavaibhav/HealthKartWeb into sachit
reward points code
RP code
reward Point code done
Merge branch 'rimal' of github.com:adlakhavaibhav/HealthKartWeb into sachit
code for js disabled
js disable msg done
resolving conflicts
removed xtra text
Merge branch 'ashish-new' of github.com:adlakhavaibhav/HealthKartWeb into sachit
no js code
css for no js
Merge branch 'master' into sachit
Done