Fix for credit card expiry entry
Merge branch 'master' of https://github.com/gminaker/databases
Merge conflicts
Fix for cc expiries
ads
Merge branch 'master' of https://github.com/gminaker/databases

Conflicts:
	views/customer/purchase_items.php
t push
fix for cc expiries
Merge branch 'master' of https://github.com/gminaker/databases
blah
FINAL COMMIT/PUSH??
Merge branch 'master' into Thomas

Conflicts:
	views/customer/purchase_items.php