Merge pull request from more-oil

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

Conflicts:
	cake-recipe.txt
One more try at pull request and merge conflicts
Changing vegetable oil to canola