change config production.rb settings for email delivery
fiddle with production.rb for email again
fix increase/decrease buttons on cart page
add mandrill-api gem
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/controllers/items_controller.rb
trying to get mandrill to work
Merge remote-tracking branch 'upstream/master'
add config/database.yml to gitignore
tinker with mandrill-api
configure Mandrill email functionality
uncomment out stripe code
uncomment out stripe code
change stripe initializer
remove stripe.rb initializer
Format store and order form
Merge changes