정리
test2에커밋
Merge branch 'test2'

Conflicts:
	ruby/ruby정리.md