foo
Add mail acc
Merge branch 'mailer'
finish create card info
finish create card info
Modify CardType model
Modify CardType model
Merge branch 'add-models'
CardType conflict resolved
Finish crud
Finish crud
Finish active admin
Finish active admin
Add items to cart
Clean up active admin view
Fix migration problem
foo
remove trouble migration
Payment model
fix conflicts