Change oil
Update to reflect more oil github
Merge branch 'master' into different-oil

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

Change oil