Merge pull request #18 from prabhsimransingh/develop

Giving latest code to develop_vaibhavi
Cart Functinality for logged in user
Merged conflicting files