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

Conflicts:
	src/test/gosu/AlgorithmTest.gs
Merge branch 'master' of github.com:carsongross/oppfinder
Merge branch 'master' of github.com:carsongross/oppfinder
dsfa