Fix for fastq files
fix conflict
Merge branch 'master' of github.com:sanger-pathogens/Fastaq
Merge branch 'master' of github.com:sanger-pathogens/Fastaq
Merge pull request #26 from martinghunt/master

sync with martinghunt (no changes)