Change oil type to motor oil
Merge branch 'master' into different-oil
Merge branch 'master' of https://github.com/bluefork/recipes into different-oil

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

Change oil type to motor oil