delete testdata, bugfix in main
Merge branch 'master' of https://github.com/daniel0076/2014-OS-homework

Conflicts:
	threading/main.cpp