ip
ip
Merge remote-tracking branch 'upstream/master'
Made client send a specified address and port.
I
Fixed message to agree with RFC
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Added team yello
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq

Conflicts:
	seek_hide_client.py
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
Merge remote-tracking branch 'upstream/master'
Added yellow broker
Merge remote-tracking branch 'upstream/master'
Add first commit of yellow team client
Merge remote-tracking branch 'upstream/master'
add broker file for violet team
my file
pink team seeker
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq