logger going in
Merge branch 'master' of github.com:cmarchini/P2P-Program

Conflicts:
	P2P-Project/src/peer/Peer.java