data.jsonの個人データを編集しました。
Merge branch 'master' of https://github.com/lastyrain/team_testBuild

Conflicts:
	common/json/data.json
Merge branch 'master' of https://github.com/lastyrain/team_testBuild

Conflicts:
	common/json/data.json