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

Conflicts:
	.gitignore
argparse
fix merge
argparse
Merge pull request #12 from simock85/master

better gitignore
Merge pull request #13 from hjacobs/master

+ argparse