Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq
fixed server message in rfc
made the shebang use python2 explicitly
Merge pull request #21 from btel/rfc

fixed server message in rfc
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