add yokohama
Merge branch 'master' of https://github.com/ywada/tutorial

Conflicts:
	test.txt