final commit on this branch?
final commit on this branch?
merged
Merge branch 'master' into hillclimbingfix
Final merge?

Conflicts:
	src/genome/Genome.java
	src/genome/Globals.java
	src/genome/Triangle.java
	src/genome/Tribe.java
	src/gui/Controller.java
	src/gui/InfoHolder.java
final merge