Shopping Cart
1.5_Shopping_Cart_#164
Adding story 2.12 for filter search for items
Merge branch 'master' of https://github.com/DevYah/smartsoft-14 into T2_tonyfoti_2.12
#158 adding filter search after organizing the code to be in the controller
#158 Adding my story 2.12 for filter search items for members with documentation as well
Rearranging some comments in the code
Shopping_cart_resolving_conflicts
Shopping_cart_conflicts_resolved
Shopping_cart_conflicts_resolved
Merge branch 'master' into T2_tonyfoti_2.12
Fixing some code conventions
Resolve Conflicts
Merge pull request #226 from DevYah/T1_AbdelrahmanSakr_1.5

T1 abdelrahman sakr 1.5
Merge pull request #221 from DevYah/T2_tonyfoti_2.12

Adding story 2.12 for filter search items for the members
adding some auto-generated OS related files to .gitignore file
removing all .DS_Store files in all folders
adding rules to root .gitignore file
resolved the conflicts after pulling master again