1行目に句読点
1行目
Merge branch 'master' of https://github.com/miaki1964/gitbootcamp

Conflicts:
	readme.txt