fix credit card length bug
end of week 1
stuff from fri
Merge branch 'master' into blah
Merge pull request #23 from ricarora/blah

Blah
merging with recent changes
Merge pull request #25 from ricarora/order-fulfillment

Order fulfillment
Merge branch 'master' into orderfulfillment