Skrivit in i manualen för srteraren. / tintin och fredrik
Added functionality for multiple goal files in SorterMain.
Martin und Christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	src/se/cs/lth/enduro/sorter/MarathonSorter.java
Sorter program now handles both marathon and lap race configurations.
Martin och Christian
Merge branch 'master' into release1