Updated War GUI
Merge branch 'master' of https://github.com/rsphifer/Cardglomerate
Updated War GUI