Work on Slide 2
Merge branch 'master' of https://github.com/brandonchinn178/calcium

Conflicts:
	images/cheese.png
	index.html
	scripts/script.js
	style/style.css