Sub butter for oil
Merge remote-tracking branch 'origin/master' into different-oil

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

Sub butter for oil