Test Timeout
Merge branch 'master' of github.com:chuenlungwang/junit

Conflicts:
	.settings/org.eclipse.core.resources.prefs