Merge branch 'master' of github.com:carsongross/oppfinder

Conflicts:
	src/main/gosu/jobs/Job.gs
Merge branch 'master' of github.com:carsongross/oppfinder

Conflicts:
	src/main/gosu/controller/JobController.gs
	src/main/gosu/jobs/Job.gs
	src/main/gosu/model/JobWorkerTracker.gs
	src/main/gosu/model/WorkerStartListener.gs