s
Merge branch 'master' of https://github.com/estn/git-study

Conflicts:
	README.md