Merge branch 'Sebastian' of https://github.com/adeadrat/Grief into Sebastian
Merge branch 'master' into Sebastian
GUI!
GUI