Merged GUI and Model: Client
Merge branch 'master' of github.com:Stromner/OOAGrupp6-SP
merged