1
Merge branch 'master' of https://github.com/huuuxi/TestJava.git

Conflicts:
	TestJava/src/main/java/com/huuuxi/jdk/collections/TestCollections.java