Acceptanstest story 3,4,5 / Fredrik och Tintin
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	src/se/cs/lth/enduro/sorter/SorterMain.java
	src/se/cs/lth/enduro/tests/TestIOHandler.java
	src/se/cs/lth/enduro/tests/TestSorterMain.java
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09
removed TestSorterMAin / tintin och fredrik