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

Conflicts:
	Enduro/src/sort/Formater.java