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

Conflicts:
	src/main/gosu/controller/DataSetController.gs
	src/main/gosu/controller/JobController.gs