改错了= =
Merge branch 'verion1.0' of https://github.com/FudanSoftwareCCWI/Lab4
into verion1.0

Conflicts:
	src/controller/Launch.java
	src/model/UnitRecord.java
	src/test/UnitRecordTest.java
	
The first version of the design