Conflictsしました：Merge branch 'refs/heads/topic_branches/add_contact' into staging

Conflicts:
	index.html
Merge branch 'refs/heads/releace_branches/2013-06-14-01' into staging

Conflicts:
	index.html
test : 間違ってstagingからブランチ切ったパターン