commit after reset to 2
Merge branch 'master' of https://github.com/ruishanfu/FooPro

Conflicts:
	ListContainPerformanceTest/src/ListContainsPerformanceTest.java