Change vegetable oil to canola oil
Merge branch 'master' into different-oil

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

Change vegetable oil to canola oil