use canola oil instead of vegetable oil
Merge branch 'master' of http://github.com/fimbria/recipes-1 into canola

Conflicts:
	cake-recipe.txt
Merge pull request #1 from Fimbria/canola

use canola oil instead of vegetable oil