Change oil from vegetable to canola
Update amount of canola oil
Fix merge conflict
Merge pull request #1 from emoarmy/different-oil

Change oil from vegetable to canola