gui調整
Merge branch 'planningTest' of https://github.com/ProjectKT/Rep7.git
into planningTest