Change oil from vegetable to canol
Merge branch 'master' of https://github.com/Neotriz/recipes into different-oil
Change Sarah to Mine recipe

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

Change oil from vegetable to canol