updated gui
Merge branch 'master' of github.com:eior93/hackathon