canols oil
Use calone instead of other oil(fixed)
Merge branch 'master' into different-oil with fixed conflict

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

Everything ok?