more better json rendering
fixing line_item model total_price method
lineitems controller
Merge pull request #25 from fishermanswharff/master

More Better JSON Rendering
Merge branch 'master' of github.com:BobsBagels/api
updating carts and line-items
Merge pull request #26 from fishermanswharff/master

updating carts and line-items
created new seed data. Ran migration to add product id to options. Created relationships to options
Merge pull request #27 from shaai/master

created new seed data. Ran migration to add product id to options. Creat...
Merge branch 'master' of github.com:BobsBagels/api

Conflicts:
	db/schema.rb
seeds and product model
Merge pull request #28 from fishermanswharff/master

seeds and product model
merging
Merge branch 'master' of github.com:BobsBagels/api
added price total to the main page (with davids help)