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

Conflicts:
	GenAlg.java
Merge remote-tracking branch 'origin/master' into connor

Conflicts:
	GenAlg.java
Merge remote-tracking branch 'origin/master' into connor
Brian had an i++ instead of a j++ in the second for loop...
Merge pull request #17 from bjacobel/connor

Connor