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

Conflicts:
	client.py
	echo.py