test
Merge branch 'master' of https://github.com/ProjectKT/Rep5.git
Merge branch 'master' of https://github.com/ProjectKT/Rep5.git
t
Merge branch 'master' of https://github.com/ProjectKT/Rep5.git

Conflicts:
	Rep5/kt_instances.txt
	Rep5/src/Frame/OurFrameSystem.java
Merge branch 'master' of https://github.com/ProjectKT/Rep5.git
従兄弟制作