Added script to merge two sorted fastq files (with custom header)
Merge branch 'master' of https://github.com/skimmy/qFilter

Conflicts:
	src/python/mergeCustomFastq.py