Use canola oil instead of vegatable oil
Merge branch 'master' of github.com:huangv22/recipes into different-oil

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

Use canola oil instead of vegatable oil