hanged to Canola oil on different-oil branch
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from kbrahl/different-oil

hanged to Canola oil on different-oil branch