added view changes into the current commit and added cart views and controllers
Merge branch 'master' into controllers
Merge pull request #6 from caisyn/controllers

Controllers