Changed oil
Corrected spelling on canola oil
Merge branch 'master' into different-oil

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

Used canola oil instead of vegetable oil