changed oil and introduced new branch
Merge branch 'master' of https://github.com/misaacs/recipes into different-oil
changing amount of oil and type(->canola)
Conflicts:
	cake-recipe.txt