Use canola oil
Use canola oil
Merge branch 'master' into different-oil
Merge remote-tracking branch 'origin/master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from mneider12/different-oil

Different oil