new kind of oil for the cake
canola oil for the cake
Merge branch 'master' of https://github.com/Piaktipik/recipes

Conflicts:
	cake-recipe.txt
Merge branch 'master' into different-oil

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

canola oil for the cake