Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
new changes
Merge pull request #13 from ferdythebull/master

fixed the products
new styling
dudeman
Merge pull request #14 from genenettles2/master

new request from Nettles
Merge remote-tracking branch 'upstream/master'