Changed vegetable oil to canola oil
Resolved merge conflict for canola oil and oil amount changes
Merge pull request #1 from abatilo/different-oil

Changed vegetable oil to canola oil