flugarten
quackarten
schwimmarten
schwimmverhalten
fixed
implemented
implemented
fixed
fixed
implemented fixed
moved game
fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ente/src/Ente/EnetenFactory.java
	Ente/src/Ente/FlugEnte.java
	Ente/src/Ente/GummiEnte.java
	Ente/src/Ente/HolzEnte.java
	Ente/src/Ente/NormalEnte.java
	Ente/src/Ente/WasserVogel.java
	Ente/src/Game/Main.java
fixed main