using canola oil instead of vegetable oil
changing back to vegetable oil
Adding canola oil to new branch
Merge branch 'master' of https://github.com/bartish/recipes
Merge branch 'different-oil'

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

Adding canola oil to new branch