merge2
Merge remote-tracking branch 'origin/hello' into shindong

Conflicts:
	aaa.txt