a
解决冲突
Merge branch 'master' of https://github.com/jhaoniu/mt_data

Conflicts:
	read.txt