CameraVC,IndividualVCの統一（仮レイアウト）
Merge branch 'master' into Fujiwara
CameraVC IndividualVC 変更 marged
Merge branch 'master' into Fujiwara
pull前のcommit
Merge branch 'master' into Fujiwara