Veel fixes
Merge branch 'master' of
https://github.com:443/Djekkoo/IntegratedProject

Conflicts:
	adhoc_setup.sh
	src/application/Client.java
	src/application/GUI.java