충돌 커밋
Merge branch 'master' of github.com:stardom84/test

Conflicts:
	README.md