second
Merge branch 'master' of https://github.com/AnniLi/Pool

Conflicts:
	main/Debug/main.log
	main/Task.cpp
	main/Task.h
	main/ThreadPool.h
	main/main.cpp