First draft of Peer.py done
Fixing merge conflicts