changed oil to canola
fixed typo in the word canola
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge branch 'different-oil' of https://github.com/KyleMcIntire/recipes into different-oil

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

changed oil to canola