Fixed error caused by configuration / Tintin & Fredrik
Merge - Fredrik o Tintin

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

Conflicts:
	testfiles/Configuration/StandardTestKonfigurationsFil.txt
merge t O F
Merge branch 'master' of github.com:RichardSimko/EDA260-Team09

Conflicts:
	testfiles/Configuration/StandardTestKonfigurationsFil.txt