Update converte impute2 data
readme genotype aligner
resolve conflicts
Merge pull request #90 from PatrickDeelen/master

Update converte impute2 data to trityper + fix merge conflicts