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

Conflicts:
	src/main/gosu/spark.gsp
Merge remote-tracking branch 'origin/master'