END structure
END structure
Merge branch 'master' of https://github.com/threem/payments

Conflicts:
	config/initializers/secret_token.rb