using canola oil instead of vegetable oil
changing back to vegetable oil
Merge pull request from more-oil

Add more oil so the cake is more moist!
Merge branch 'master' of https://github.com/bartish/recipes
Merge branch 'different-oil'

Conflicts:
	cake-recipe.txt