the .gitignore
Merge remote-tracking branch 'upstream/master'
Products are displaying on the show page
Merge pull request #15 from ferdythebull/master

created functionality for the products
resolve merge conflicts