replace canola by neptune
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt
Merge pull request #2 from anhtuan23/different-oil

replace canola by neptune