makro2 changed
finished
final commit

Conflicts:
	UTC Clock (JavaFX)/src/main/ClockController.java