commit
Merge branch 'master' of https://github.com/lisi806/MyJava--Test.git

Conflicts:
	src/CoverTest.java
	src/�FatherCover.java