윈도 수정.
Merge branch 'master' of github.com:sakim/git-test

Conflicts:
	README.md