Genotyping

Genotyping added and output format changed