change vegetable oil to canola
fix typo in canola
resolve conflict 3/4 canola oil
Merge pull request #1 from kidpixel/different-oil

change vegetable oil to canola