[프/최주현] merge / confilct Test
[프/최주현] merge Test

Merge branch 'master' of https://github.com/nopsse/TestGit

Conflicts:
	CommitTest.txt
[프/최주현] Add file2