Added name in competitor. Rickard & Karl
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Added names. Rickard Karl
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/sorted_result.txt
	Enduro/src/sort/Competitor.java
	Enduro/src/sort/SorterMain.java
	Enduro/src/test/TestReadResult.java
Fixed Story 4, All test Works, Rickard och Karl
Löste merge
Fixad Merge Karl Rickard

Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/sort/Competitor.java
	Enduro/src/test/TestCompetitor.java