use canola instead of vegitable oil
Merge branch 'master' into diffrent-oil

Conflicts:
	cake-recipe.txt
Merge branch 'master' into diffrent-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from hideki/diffrent-oil

use canola instead of vegitable oil