Add cart resources
Add cart resources to master
Fix merge conflict in user_spec, add Cart resources
Merge pull request #47 from rNavarrete/jim-routes

Jim routes