use canola oil since it's healthier
corrected spelling of canola
Merge branch 'master' into different-oil

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

use canola oil since it's healthier