Modify2
Merge branch 'master' into news-page_m-sato
Conflict解決２
Conflicts:
	news.html
Merge branch 'master' of https://github.com/tyrellsys/group1