Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq
made the shebang use python2 explicitly
Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq
Merge branch 'master' of github.com:dAnjou/ep2014_zeromq

Conflicts:
	client.py
	echo.py
note on broker
add note
Merge pull request #23 from dAnjou/master

made the shebang use python2 explicitly
Merge pull request #24 from hjacobs/master

add note on broker
Added get_local_ip function
new client for seek and hide
Merge pull request #25 from flazzarini/master

Added get_local_ip function
made the shebang use python2 explicitly
Starting on RFC-002
Improved RFC-002
Merge pull request #27 from btel/seek_and_hide

new client for seek and hide (just copy of client)
Merge pull request #28 from dAnjou/master

made the shebang use python2 explicitly (now really)
pyflakes: client.py:18: redefinition of unused 'socket' from line 4
Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq
Added get_local_ip
Merge pull request #30 from xando/master

pyflakes: client.py:18: redefinition of unused 'socket' from line 4