Added shopping cart.
Merge branch 'master' of github.com:brownhead/cs166_project

Conflicts:
	mnet/views/__init__.py