test2추가
bugfix
test2추가
bugfix
Merge branch 'master' into develop

Conflicts:
	test2.rtf
change old