Change from veggy oil to canola oil
Add more oil to make cake more moist
Merge branch 'master' into different-oil

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

Change from veggy oil to canola oil