changes oil to canola oil
fixes canola spelling error
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
changes oil to 3/4 cup
Merge pull request #1 from GoesToEleven/different-oil

changes oil to canola oil