new file test2
Change hello text.
Changed Hello text too.
Merge branch 'dev'
use master change.
Conflicts:
	test.c
changed test2.c
changed test2 too.
Merge branch 'dev'
add new file and start to write test2.c
a test
Merge branch 'new'