test
Merge branch 'master' into otherGenetic
Some tests
Fix
Better version of the genetic algorithm
Merge branch 'otherGenetic'

Conflicts:
	src/se/kth/hugosa/schedule/genetic/GeneticSchedule.java