Refactor lulz. Andrée Henrik
Merge remote-tracking branch 'origin/master'
Refactoring and synchronizing of all the different tests to test the
same type of files. Henrik Andrée
Fixed Merge conflicts and moved Story 3-6 to DONE. Henrik Andrée
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/acceptanstest/resultat.txt
	Enduro/src/acceptanstest5/resultat.txt
	Enduro/src/acceptanstest6/resultat.txt
	Enduro/src/acceptanstest6/resultat_2.txt
	Enduro/src/sort/StdCompetitorPrinter.java