Added a products model and controller
populated the product
products in progress
fixed a merge conflict
Merge pull request #7 from richsalvucci/master

Added Cart
added some stuff to product
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from ferdythebull/master

Added a products model and controller
added columns to products
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from ferdythebull/master

Looks good.
Pulling down Products Contoller
fix conflicts schema and development log