afa
Merge branch 'master' of https://github.com/luochengleo/query2vec

Conflicts:
	query2vec/sogout08/geneScripts.py