gui added
Merge branch 'master' of https://github.com/invisiblekid15/java-minor-14