Se ２回目
Merge branch 'master' of
https://github.com/fyoshida2014/RepoForTestGit.git

Conflicts:
	Life.html