Change vegetable oil to canola oil
fixed typo
Merge branch 'master' of https://github.com/bretthclarke/recipes into diff-oil

Conflicts:
	cake-recipe.txt
Reverted back to 1/2 cup to retry the exercise
Change diff-oil branch to reflect the change in oil with more oil
Add intentional typo to cake recipe
Restore master to after sarah's changes