module changes only

Conflicts:
	phase_1_testing/lib/HL7.rb
fixed conflicts from merge
merging changes from test-runner branch