merged?
Merge branch 'master' of https://github.com/alexyz/hl7.git

Conflicts:
	.gitignore
various fixes