animation progress
Merge branch 'master' of https://github.com/HAWJulian/MG1.git

Conflicts:
	MG1/src/gui/ClockPanel.java