4 kyougou
Merge branch 'master' of https://github.com/110chang/tutorial

Conflicts:
	sample.txt