Change type of oil to Canola
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from kj786/different-oil

Change type of oil to Canola