Restructured code, now merging happens at the fastq record level. A number of bug fixes. Moved some old files to the Old/ folder.