Shopping Cart
1.5_Shopping_Cart_#164
Story 5.5 complete and working
Modifications
userStories 1.4_1.5 back-end
user can show/ edit profile
 a  user can show and edit profile
user can edit profile
after change file spaces
code after changing the line spaces
after removing myprofile from views/members
updating the front END of my story
Resolving Conflicts
Merge branch 'master' into T5_hazem_5.5
We had 2 columns status and paused, while both of them are really the same
Modification upon the previous commit
Whoever put the javascript_include_tag INSIDE the loop, is a GENIUS :S
Button name was negated and fixed upon Jihan's review
fixed confirmation box content
Shopping_cart_resolving_conflicts