edit data
Merge branch 'master' into uryu1994/edit2

Conflicts:
	unity-testProject/Assets/main.unity
Merge pull request #2 from uryu1994/uryu1994/edit2

edit data