Gui added
Gui added
Merge branch 'master' of https://github.com/uitgeholzerd/ds-practicum

Conflicts:
	DS-SystemY/src/be/uantwerpen/ds/system_y/client/Client.java
Gui further testing
Merged