modify test.tmp in test
Merge branch 'test'

Conflicts:
	test.tmp