changed vegetable oil to conala
Merge branch 'master' into different-oil

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

changed vegetable oil to conala