added stripe gem
Merge branch 'master' into stripe
dkaf
Merge branch 'master' into stripe
Merge branch 'master' into stripe
added stripe gem
added charges resources to routes.rb
Merge branch 'master' into stripe
resolved conflicts in routes.rb
Meal Ticket!
Merge pull request #3 from eubenesa/jill-begin-styling

Jill begin styling
Fuckton of cultural value here: partials and user model update. Eat it, Jim Jones.
Merge pull request #4 from eubenesa/skeleton-layout

Skeleton layout--almost done, but Users updated
BS commit
added better_errors, pry-rails, etc.
added pool_amount column to users
fixed schema.rb merge conflict
Blech
charges!
Merge branch 'skeleton-layout' of https://github.com/eubenesa/romanchukenator into stripe