local edits
Merge branch 'master' of https://github.com/nickfun/stuff

Conflicts:
	tpool/BigJob.java
	tpool/TPool.java