test
Merge branch 'ning'

Conflicts:
	hello.txt