Merge branch 'master' into braintree_stub
Adding braintree gem
Adding braintree js
Adding braintree config
Braintree flow stub
merging up master
Merge pull request #1 from mseckington/braintree_stub

Braintree stub