Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/gosu/view/Root.gst
Merge branch 'master' of github.com:mattgode/oppfinder

Conflicts:
	src/main/gosu/jobs/Job.gs