pre-rebase commit
resolved conflict
rebasing
set up config and css files for bootstrap
created basic tests for the Product model
one small edit
fixed minor rspec issues with Zoe
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)
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
header first draft