Change oil from sunflower to canola
Merge branch 'master' into different_oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from d4v1dcl4rk3/different_oil

Change oil from sunflower to canola