test
Merge branch 'master' of https://github.com/sternze/VerteilteSysteme_PA2

Conflicts:
	PA2/src/failure_detector/MyFD.java