without charmatch
Merge branch 'master' of https://github.com/sahirbhatnagar/ovarian

Conflicts:
	pheno.R