Don't tell me you're too blind to see

Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Peer.java