Merge with all of Alex's code (including unfinished AntBrain genetic
algorithm)
Merge
 Merge
Merge commit '9e0cae13f3c328876582c18820ee1d0ed928d044'

Conflicts:
	src/antgame/Tournament.java
	src/antgame/core/BrainState.java
Test
Test
Merge
Merge
Merge branch 'master' of https://github.com/Team17/AntGame.git

Conflicts:
	bin/antgame/core/InvalidMarkerIdException.class
	bin/antgame/core/Marker.class
Merge branch 'master' of https://github.com/Team17/AntGame

Conflicts:
	src/antgame/AntGameProperties.java