Revert diff-oil branch to before merge
Merge branch 'master' into diff-oil

Conflicts:
	cake-recipe.txt
Merge pull request #1 from bretthclarke/diff-oil

Change vegetable oil to canola oil