no message
Merge branch 'alleles' of https://github.com/bulik/ldsc into alleles

Conflicts:
	ldscore/parse.py