afasfasdfasdfdsf
asdfasf
Merge branch 'PING'

Conflicts:
	aaa.txt
Merge branch 'PING'
Merge branch 'master' of https://github.com/EricPing/Practice-0614