update gem
fix merge conflicts
css so that the layout doesn't drive me totally bats
css so I don't go crazy
fix merge conflicts
Merge branch 'products'