Changed vegetable to canola oil
Merge branch 'master' of https://github.com/ncsmith/recipes into different-oil

Conflicts:
	cake-recipe.txt
Changed vegetable oil to canola oil
Merge pull request #2 from ncsmith/different-oil

Different oil