add different oil
resolve Sarahs conflicts
Merge pull request #1 from arimages/different-oil

add different oil