gitignore
Merge branch 'master' of github.com:1000mercis/ep2014_zeromq

Conflicts:
	.gitignore
Made RFC more explicit
argparse
Merge pull request #11 from emilisto/master

Made RFC more explicit
fix merge
argparse
Added msg format
Merge pull request #12 from simock85/master

better gitignore
Merge pull request #13 from hjacobs/master

+ argparse
change default bind address
Merge pull request #20 from flazzarini/master

Added msg format
fixed server message in rfc
Merge pull request #21 from btel/rfc

fixed server message in rfc