small changes
Merge branch 'derk' of github.com:i3anaan/serialkiller into derk

Conflicts:
	src/link/angelmaker/nodes/RetransmittingNode.java
	src/test/ReceiveTest.java