Add canola oil
Merge branch 'master' of https://github.com/krishnans/recipes into different-oil

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

Add canola oil