"Added shopping cart functionality. A few minor changes here and there as well."
Merge branch 'master' of git@github.com:clenk/Heartbleed-Lab-Project.git

Conflicts:
	shop.php