Prel. Time. / Andrée, Henrik
Merge remote-tracking branch 'origin/master'
Working Time. / Andrée Henrik
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4

Conflicts:
	Enduro/src/result/Parser.java