Change vegetable to canola oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Remove extra comment line
Merge pull request #1 from jaelim/different-oil

Change vegetable to canola oil