test
folder 수정
Merge branch 'master' of https://github.com/mosaic79/repo.git

Conflicts:
	gittest/WebContent/WEB-INF/index2.html