Change to a different oil (canola)
Merge branch 'master' into different-oil

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

Change to a different oil (canola)