more work on guis
Merge branch 'master' of https://github.com/prodrummer5/FwumDeFight