use canola oil instead of vegetable oil
Merge branch 'master' into differentOil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from CodeKray/differentOil

use canola oil instead of vegetable oil