Pulling down Products Contoller
fix conflicts schema and development log
Added .rvmrc .gitignore as well as some cart functionality
Merge pull request #9 from richsalvucci/master

Some cart updates and house keeping
yup
Merge remote-tracking branch 'upstream/master'
new styling