会社ページを追加
add park lucy  ticket NO. text
mapファイルを追加しました
# news-page.html ファイル追加
チケットにひも付け＋修正内容を記載する
例：newsページを追加
Merge branch 'news-page'
Merge branch 'master' of github.com:tyrellsys/group1
Merge branch 'master' into news_page_koike
Merge branch 'master' into news-page_m-sato
tttttt#####
Merge branch 'packtest'
Merge branch 'master' of https://github.com/tyrellsys/group1
conflict 解決
Conflicts:
	news.html
Merge branch 'master' of https://github.com/tyrellsys/group1
Modify2
Merge branch 'master' into news-page_m-sato
Conflict解決２
Conflicts:
	news.html
Merge branch 'master' into news-takahashi
Merge branch 'master' of https://github.com/tyrellsys/group1
koike_branchを作成して、index.htmlを修正
refs #00001
Merge branch 'master' into takahashi

Conflicts:
	index.html