back to basics
Merge branch 'master' of
https://github.com/simonlindberg/LanTransfer_2000.git

Conflicts:
	src/GUI/GUI.java
	src/broadcast/BroadcastSender.java