test 3 second time
Merge branch 'test3'

Conflicts:
	hello.c