Angriff bearbeitet
Merge remote-tracking branch 'origin/master' into lucas

Conflicts:
	Revenge_of_the_Penguins/Bilder/Revengeof_thePenguins-Title.png
Background test
merge from Jonas
Merge remote-tracking branch 'origin/jonas' into lucas
Yeti bearbeitet
Yeti mit Pistole
Weapons
Weapons fertig und Bilder sortiert
gameoverPic
gameoverpic bearbeitet
merge von saskia
Merge master into saskia
other bgs, object destructor
merge jonas into lucas
fixed merge - merge saskia into lucas
merged from master
Merge remote-tracking branch 'origin/lucas' into lukas
Field weapon edit
yeti shotgun&rocket