Pulled code
check cart functionality
removed conflict in files
Added code for list-view
Pulleds code of develop
Added scroll bar on list view page
applied style to grid view