調整しました
Merge branch 'master' of https://github.com/onakaponpon/Kaidaaaaan

Conflicts:
	Kaidaaan0408/src/testApp.cpp