Deconstruction
Merge remote-tracking branch 'origin/saskia' into jonas
Added Yeti-Attack
View

view kopiert sich daten aus objectmanager
erweiterung von object.cpp um getSprite()
Updated AIControl  + Created class Box
View

Klasse mainwindow durch window(QWidget) ersetzt
View

Klasse mainwindow durch window(QWidget) ersetzt
Merge remote-tracking branche `orgin ` into Lucas
Basisfunctions for GameManager
Merge lucas/lukas into jonas
Merge from jonas to master
Merge remote-tracking branch 'origin/master'

Conflicts:
	Revenge_of_the_Penguins/inventory/kevlar.h
Merge remote-tracking branch 'origin/master' into lukas
Improved GameManager
KillManager
Added Collision for Objects
Small Changes
Improved Inventory
Adjust weapon inheritance
Merge remote-tracking branch 'origin/lukas' into jonas