Merge origin/master

Conflicts:
	src/display/GUI.java
	src/model/Gene.java
Merge origin/master