Working GUI

GUI now displays the needed information
Merge branch 'master' of https://github.com/lovvorn/sw-arch-1