shootとmesColor
無視設定
hitokoto
Merge branch 'master' of https://github.com/haiatto/OGJ_Koekatamarin

Conflicts:
	.gitignore
	New Unity Project/New Unity Project.userprefs
	server/client.html
	server/server.js