working on company controller stuff
Merge remote-tracking branch 'upstream/master'

carson fixed the sparkgs stuff
fixing pom by adding the src directory + deleting the committed prj file
ignoring iml files
gr8
gr82
fixed
i'm paranoid
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
Merge pull request #2 from jchoigw/master

My latest stuff, Resync
removing target directory
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/gosu/datagen/Generator.gs