...
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git
Merge branch 'master' of https://github.com/EdanLTHgit/Enduro4.git

Conflicts:
	Enduro/src/clientSPIKE/Client.java
	Enduro/src/clientSPIKE/Gui.java
	Enduro/src/clientSPIKE/Output.java
UML folder deleted.