Changed cake recipe to canola oil
Merge branch 'master' into different-oil

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

Changed cake recipe to canola oil