all products now shown
added products routes
commit
fixed conflicts
fixed products controller conflicts
Merge branch 'ProductsIndex'