added "terms and conditions" and "about us"
added exception handler gem
Added the Paymill gem
ignore database dump from Redis
Include the PAYMILL_PUBLIC_KEY in layout/application
paymill js and initializer.
add credit card information to the order form.
Created Order.save_with_payment
place_order uses @order.save_with_payment
fix indenting.
SampleSize equals the total amount of coffee in a shipment.
merge
Merge branch 'feature/paymill' into feature/simplyfy_order_form

Conflicts:
	app/controllers/pages_controller.rb
quick bug fix.
Merge branch 'master' into feature/paymill

Conflicts:
	app/controllers/pages_controller.rb
Merge commit '6628abd63088ca5ec0bbd160720377b8825b14b2' into feature/paymill

Conflicts:
	app/controllers/pages_controller.rb
put subscription styling in a separate file.
move the subscription type choice away from the address.
.large_font style
renamed from css.sass to .sass