Merge pull request #12 from bjacobel/connor

Tournament Selection
boltzmann selection
Merge pull request #13 from bjacobel/brian

boltzmann selection
Merge remote-tracking branch 'origin/master' into connor

Conflicts:
	GenAlg.java