use canola oil
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
changed vegie oil to canola oil
Merge pull request #1 from jkunchandy/different-oil

use canola oil