no message
Merge branch 'master' of https://github.com/MartinHartmanndk/duplex

Conflicts:
	.gitignore