Use canola oil instead of vegetable oil
Merge branch 'master' into diffrent-oil

Conflicts:
	cake-recipe.txt
Merge pull request from more-oil

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

Conflicts:
	cake-recipe.txt