GUI
Merge branch 'master' of https://github.com/muZk/IIC2333-Grupal
update