updated cart manager
resolved conflict
cart with cookie functionality added
Merge branch 'master' of https://github.com/Live-Oak/FlipKartProject
Merge branch 'master' of https://github.com/Live-Oak/FlipKartProject