timmy
Merge branch 'master' of https://github.com/scarygrossrake/chessjam

Conflicts:
	src/Config.java
	src/Solver.java
poop
Merge branch 'master' of https://github.com/scarygrossrake/chessjam

Conflicts:
	src/Solver.java
gdnfsjgdf