Replace vegetal oil for canola oil
chancge oil from 1/4 to 3/4
change vegetable oil to 1/2 instead 3/2 cup
Do nothing
change quantity of cups of oil

Conflicts:
	cake-recipe.txt
do nothing
do nothing
Merge branch 'master' of https://github.com/Almaral-Engineering/recipes

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

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

Replace vegetal oil for canola oil