Changing vegetable oil to canola oil
Merge branch 'master' of github.com:jpaek/recipes into different-oil

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

Changing vegetable oil to canola oil