Here is some updated CSS and HTML. It says I updated .js but I am not sure
what I changed there.
Merge branch 'master' into coltonbranch

Conflicts:
	pizza.js
Merge branch 'master' into coltonbranch