Changed vegetable oil to olive oil
Merged master
Changed oil to canola oil
Merge branch 'master' into different-oil

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

Changed vegetable oil to olive oil