Merge pull request #1 from zhuoweic/different-oil

Use canola oil
Revert "Use canola oil"
Merge pull request #2 from zhuoweic/revert-1-different-oil

Revert "Use canola oil"
Merge pull request from more-oil

Add more oil so the cake is more moist!
Merge branch 'master' into different-oil

Conflicts:
	cake-recipe.txt