Merge remote-tracking branch 'upstream/master'
in the middle of installing devise
Merge remote-tracking branch 'upstream/master'
merge test
Merge pull request #12 from richsalvucci/master

Cart changes
new changes
Debugged the products
Fixed a temporary file issue
Merge pull request #13 from ferdythebull/master

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

new request from Nettles
git Ignore
fixed git ignore
Cart controller