Changes oil to canoil instead of vegetable
Fixed misspelling for pull request
Merge branch 'master' into different-oil

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

Changes oil to canoil instead of vegetable