Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
basics working
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
automatically use local address
join Team red
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq
keep local port to comply with RFC, codevalidator formatting
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq
move file
Almost (?) working client and broker.
connect to google.com on the correct port
Merge branch 'master' of https://github.com/1000mercis/ep2014_zeromq into mercimaster
Cleanup plus a little work to meet RFC-002
Merge pull request #73 from itbsStefan/master

join Team red
Merge pull request #76 from mostarman/master

Implementation of RFC-002 of Team Black
Merge pull request #74 from simock85/master

connect to google.com on the correct port
Merge pull request #75 from katharosada/mercimaster

Mercimaster
Merge pull request #71 from hjacobs/master

automatically use local address