Added purchase time to order confirmation
Fix merge conflicts
Order confirmation lists ordered products
Merge branch 'master' of github.com:audreycarlsen/sloth_express

Conflicts:
	db/development.sqlite3