add test1234
modify resolve conflicts
merge commit
merge commit.
Merge remote-tracking branch 'origin/master' into T1-2

Conflicts:
	source/test1/newfile01.php
Merge pull request #14 from Hyunghu-Kim/T1-2

T1-2 commit : review ok