change oil type to canola
correct spelling of conola
merge conflict
Merge pull request #1 from nicolegoebel/dfft-oil

change oil type to canola