second commit
Merge branch 'master' of ssh://GITHUB/unsigned-tamanegi/Thread

Conflicts:
	Condition.h
	entry.cpp