Merge branch 'master' of https://github.com/FireKraken/o-rlyeh

Updated GUI for dialogue
Merge branch 'master' of https://github.com/FireKraken/o-rlyeh