Fixed an attempt to get user's IP in Peer.Join_Network(), exposing another problem
Fixed local merge conflict
Merge branch 'master' of https://github.com/c1phr/p2pchat
Merge branch 'master' of https://github.com/c1phr/p2pchat
Added the deliverable.
Added the deliverable.