Use canola oil
Merge pull request from more-oil

Add more oil so the cake is more moist!
Merge branch 'master' into different-oil
Merge remote-tracking branch 'origin/master' into different-oil

Conflicts:
	cake-recipe.txt