Add canolle oil
Na verdade se escreve Canola
Merge branch 'master' into different-oil

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

Add canolle oil