Add canola oil for vegitable oil
Merge branch 'master' into differnt-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from jehyman/differnt-oil

Add canola oil for vegitable oil