merging
Merge branch 'master' of https://github.com/laurabreiman/science-of-cooking

Conflicts:
	perfectSteak.js