acceptans19
mikael och christian
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	src/se/cs/lth/enduro/register/model/Driver.java
	src/se/cs/lth/enduro/sorter/StageSorter.java
	src/se/cs/lth/enduro/tests/acceptance/AcceptanceTest19.java
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09