071604
Merge pull request #12 from iam-interworks/add071604

toStaging - done
add hogs
Merge pull request #16 from iam-interworks/staging

Staging
Merge branch 'hoge' into staging

Conflicts:
	index.html
index2の追加
hoge -> huga by ishida
hogs -> foo by inokubo
Revert "hogs -> foo by inokubo"

This reverts commit 6dad94db8d5a066118264d3cc96c4d5e4fb32f7f.
Merge branch 'master' of https://github.com/iam-interworks/test
変な文字追加
huga -> foo by inokubo
Merge pull request #17 from iam-interworks/index2

huga -> foo by inokubo ok
1
2
Merge branch 'index2' of https://github.com/iam-interworks/test into index2

# By inokubo
# Via inokubo
* 'index2' of https://github.com/iam-interworks/test:
  huga -> foo by inokubo

Conflicts:
	index2.html
Merge branch 'index2' of https://github.com/iam-interworks/test into index2

Conflicts:
	index2.html
Merge pull request #18 from iam-interworks/index2

Index2 ok
add1
Merge pull request #19 from iam-interworks/add1

Add1が完成したので検証環境に反映