Recommit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/appname/gui/ClockPanel.java
Recommit