Fixed discrepancies in faulty merge. By Henrik & Philip
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Changed gui and the read system time to better fit the demands of the
client. (Added 1 hour from read time, and made textArea non-focusable.)
by Henrik & Philip
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Merged new changes with faulty min_time in competitor. by Henrik &
Philip
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git