"blup" procedure added to scan1 and scan1.threshold
standard error of heritability now implemented
merge

Merge branch 'master' of https://github.com/simecek/HPQTL

Conflicts:
	DESCRIPTION