Switched form canola oil to olive oil.
Merge branch 'master' into different-oil

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

Switched form canola oil to olive oil.