Merge pull request #1 from DawoonC/different-oil

change vegetable oil to canola oil
Revert "change vegetable oil to canola oil"
Merge pull request #2 from DawoonC/revert-1-different-oil

Revert "change vegetable oil to canola oil"
Merge pull request from more-oil

Add more oil so the cake is more moist!
change oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt