Added test-output to gitignore
Added sample genotype and some refactorings
Merge remote-tracking branch 'origin/master'