Story 5.5 complete and working
Modifications
userStories 1.4_1.5 back-end
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
Following Code Conventions
Merge pull request #207 from DevYah/T5_hazem_5.5

Story 5.5 complete and working
Merge pull request #218 from DevYah/T1_andrewKhouzam_1.4

1.4_As a user I should see my recomended items in the hub and 1.5_As a user, I should be able to see “add to wish list” button within each item.
solving conflicts