Bug fix trityper reader, plus added test that would have detected the bug
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
fix hudson
Merge pull request #98 from PatrickDeelen/master

fix bug in trityper, fix hudson
Merge pull request #99 from Bonder-MJ/master

Quick fix for jenkins
attempt to fix jenkins
Merge pull request #100 from PatrickDeelen/master

attempt to fix jenkins
extra test trityper
Updates to plink readers / writers
Merge branch 'master' of https://github.com/molgenis/systemsgenetics
Update README.md
Merge branch 'master' of https://github.com/molgenis/systemsgenetics.git
update version genotype aligner
update version genotype aligner
Merge pull request #101 from PatrickDeelen/master

some fixes and updates
fixed confilict