Merge branch 'master' into hillclimbingfix
Major gui and crossover updates

Conflicts:
	src/genome/Genome.java
	src/genome/Globals.java
	src/genome/Tribe.java
	src/gui/Controller.java
globals are causing me headaches