Shopping Cart
1.5_Shopping_Cart_#164
Adding story 2.12 for filter search for items
user can show/ edit profile
 a  user can show and edit profile
user can edit profile
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
after change file spaces
code after changing the line spaces
after removing myprofile from views/members
#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
after adding some mac files
Shopping_cart_conflicts_resolved
Merge pull request #228 from DevYah/guiTeam

Updating the layout in application.html.erb merged and works properly
everything is now working very goood
everything is ok
ok