싫다
Merge branch 'test20'

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/arcrim/arct.git