Change vegetable oil to canola oil
Merge branch 'master' into new-oil

Conflicts:
	cake-recipe.txt
Merge branch 'new-oil'
Merge branch 'different-oil'
Merge pull request from more-oil

Add more oil so the cake is more moist!
Change to olive oil
Merge pull request from more-oil

Add more oil so the cake is more moist!
Change to canola
Olive
Merge pull request from more-oil

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