fixing pom by adding the src directory + deleting the committed prj file
ignoring iml files
Changes to job to pull data from db.
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
Merge branch 'master' of github.com:mattgode/oppfinder

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

Conflicts:
	src/main/gosu/jobs/Job.gs
Merge remote-tracking branch 'mattgode/master'

Conflicts:
	target/classes/spark$block_0_.class
	target/classes/spark$block_1_.class
	target/classes/spark$block_2_.class
	target/classes/spark.class
Merge remote-tracking branch 'upstream/master'

Conflicts:
	opp_finder.iml
	pom.xml