File replication
Merge branch 'master' of github.com:bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/Client.class
Merge branch 'master' of github.com:bartmoons/gedistribueerdesystemen

Conflicts:
	bin/be/uantwerpen/FileReceiverThread.class
	json/replicated.json