better
asdf
Merge branch 'master' into views
Merge pull request #8 from caisyn/controllers

Controllers
pagination
Merge branch 'master' into views
Merge pull request #9 from caisyn/views

Views
changed queries in model
Merge branch 'master' into modelupdate
Merge pull request #10 from caisyn/modelupdate

Modelupdate
Added basic cart view code
Merge branch 'master' into controllers
added new database file with test data in it
Merge branch 'master' into modelupdate
Merge pull request #11 from caisyn/modelupdate

Modelupdate
finished basic forms on cart view and added process order methods to the controller
Merge branch 'master' into controllers