Added credit card scaffolding
Merge branch 'master' of github.com:camperoo/subscriptions

Conflicts:
	spec/dummy/db/schema.rb