Merge branch 'master' into adam-steel
Merge branch 'adam-steel'
Stripe added. Troubleshooting commencing.
Stripe works sometimes. Unreliable card token passing.
Deletes Ryan Bates's ideas.
Adds query-turbolinks gem.
Stripe works. No customer creation.
Smooth striping.
Merge branch 'stripe-setup' into adam-steel
Delegates attribute methods.
Configures mailer.
Deletes Railscast coffeescript.
Merge branch 'adam-steel'
Merge branch 'master' into adam-steel
Sends new order to confirmation page & fires email
Pay, Increase, Decrease, Cancel, Functional
Adds trip detail resend ability.
Merge pull request #8 from DenglSteel/adam-steel

Adam steel