Altered cake recipe to use canola oil instead of vegetable oil
Fixed "canolx" spelling mistake in cake recipe
Merge branch 'master' into different_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from simonayzman/different_oil

Altered cake recipe to use canola oil instead of vegetable oil