Change veg to canola oil
Fix typo in ingredients
Merge branch 'master' into different-oil

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

Change veg to canola oil