Wrote my own cart!
reorganized header views
Created cart view with js items deleting and a form.
Added emaling orders
Merge branch 'master' into internet
Added emaling orders

Conflicts:
	application/views/header.php
removed cart from header
Fixing jquery inclusion
Merge branch 'master' into internet
Fixing jquery inclusion
Fixing cart view
Merge branch 'master' into internet
Fixing cart view
Fixing cart view
Merge branch 'master' into internet
Fixing cart view
Trying to get mail working
Merge branch 'master' into internet
Trying to get mail working
Trying to get mail working
Merge branch 'master' into internet
Trying to get mail working
testing email
Merge branch 'master' into internet
testing email
testing email
Merge branch 'master' into internet
testing email