fix
Merge branch 'master' of https://github.com/hugoflug/schedule

Conflicts:
	src/se/kth/hugosa/schedule/genetic/GeneticSchedule.java
Merge branch 'master' of https://github.com/hugoflug/schedule