Neue Klasse: Kreis
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/animators.txt
Merge branch 'master' of https://github.com/swp2014/berlin2024

Conflicts:
	src/animators.txt
Merge pull request #4 from brier123/master

Neue Klasse: Kreis