Change type of oil to canola
Change "olive" oil to "canola" oil
Merge branch 'master' into different-oil

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

Change type of oil to canola