Changed vegatable oil to canola oil.
Merge branch 'different-oil'

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

Changed vegatable oil to canola oil.