Fixat story 29

Mikael och Christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

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