Changed from Måltider to Maltider. Victor & Rickard
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/result/Parser.java