2013-09-26 00:43
Merge branch 'master' of https://github.com/justx1/Stripe

Conflicts:
	Gemfile
	Gemfile.lock
	Procfile