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

Conflicts:
	gittest/WebContent/WEB-INF/index2.html
branch1_rebase
Merge branch 'branch1' of https://github.com/mosaic79/repo.git into branch1