Added styling to cart. Fix bug in user sign up where editing account would create a new phone_number instance each time
Merge branch 'master' of github.com:kishkaru/project-mule into cart_modal3
Fixed phone number adding for user created by admin to use better technique
tests run
Merge pull request #20 from kishkaru/cart_modal3

Cart modal3
Merge branch 'master' of github.com:kishkaru/project-mule into cart_modal3
Fixed display bug for phone number in user/show.html
Merge pull request #21 from kishkaru/cart_modal3

Cart modal3
Fixed rspec test
Merge pull request #22 from kishkaru/cart_modal3

Fixed rspec test
Merge branch 'master' into item_ingredient_jquery

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json
	coverage/index.html