Changing to Canola Oil since it is healthier.
Merge branch 'master' into different-oil

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

Changing to Canola Oil since it is healthier.