peanut oil
Peanut to canola change
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from drewman7/different-oil

Merging the peanut/conola/amount