Merging
Merge branch 'master' of https://github.com/pr342/SimulatedEvolution
Merging
Added GUI changes back, some bug fixes in evolve