what is it?
Merge branch 'story' of github.com:HummingTop/doresol_hybrid into story