add text
Merge branch 'master' of https://github.com/yatemmma/study_git

Conflicts:
	src/yamasaki.txt
Merge branch 'master' of https://github.com/yatemmma/study_git