Vegetable oil to canola

Merge different-oil into master