Added a products model and controller
populated the product
products in progress
fixed a merge conflict
added some stuff to product
Merge remote-tracking branch 'upstream/master'
Merge pull request #5 from ferdythebull/master

Added a products model and controller