Changed to using canola oil
Fix canola oil spelling
Merge branch 'master' of https://github.com/UdacityJeremy/recipes into different-oil

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

Changed to using canola oil