# news-page.html ファイル追加
Merge branch 'master' into news-page_m-sato
Merge branch 'master' of https://github.com/tyrellsys/group1
conflict 解決
Conflicts:
	news.html
Merge branch 'master' of https://github.com/tyrellsys/group1