Use canola oil instead of vegetable oil"
q
Fixed typo
Resolved conflicts
Merge pull request #1 from chadmhorner/different-oil

Use canola oil instead of vegetable oil