Merge branch 'master' of github.com:fengchejuren/thinkingInJava

Conflicts:
	src/containers/IndivialTest.java
test git In eclipse
Test