error
Merge branch 'master' of https://github.com/krille0x7c2/GameProjekt

Conflicts:
	my-gdx-game/src/com/me/mygdxgame/ObjectsInTheWorld/Ducks.java