Never gonna say goodbye

Now we get the peer_id and our _id
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Peer.class