Change the vegetable oil to canola
Merge diff-oil and master branch
Merge pull request #1 from deka108/diff-oil

Change the vegetable oil to canola