Change vegetable oil to butter
Clarify that you can also use ghee
Merge branch 'master' into different-oil

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

Change vegetable oil to butter