initial
shock-diesel -> bio-diesel
simplification
Merge branch 'shock_diesel'