- resolving conflicts
Merge branch 'master' of github.com:raylim/CLC-modules

Conflicts:
	fastq.mk