add some text file
Add all text file
コンフリクトの修正
Merge branch 'master' into Camera