resolved conflict
rebasing
created basic tests for the Product model
one small edit
fixed minor rspec issues with Zoe
Merge pull request #4 from daveyk535/rspec1

tests look good!
initial setup for user transactions view
set up controller and formatted html
added more seed data
added back handlebars templates and some custom css
transactions page built out (except for buttons, and javascript)
Merge pull request #5 from zoe-g/transaction_page

Looks great!
pre-rebase commit
added aws gem
s3 implementation
new product working with small bug in image
pic upload and product edit done
reviewed verstion of pic upload
messed with seed and schema, seed still in error
Merge pull request #6 from timsanty/pic_upload

looks awesome!!
 
after you rebase to this commit, remember to bundle install and rake db:migrate (there are changes to the gems and models), but do not rake db:seed -- Tim is still working on changing the seed files to work with paperclip.