Ignored, removed and wiped .orig
Merge branch 'shelly-1.0' of https://github.com/adinapoli/Shelly.hs into shelly-1.0