M o T
Added test for marathonsortermiscinfo. Hannes Tintin
added files to test. H T
merge fix. HT

Merge branch 'master' of https://github.com/RichardSimko/EDA260-Team09

Conflicts:
	src/se/cs/lth/enduro/sorter/StageSorter.java