View

Klasse mainwindow durch window(QWidget) ersetzt
Merge remote-tracking branche `orgin ` into Lucas
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
Adjust weapon inheritance
Merge remote-tracking branch 'origin/lukas' into jonas
KillManager
Log + game_dir + gameManager
Log + game_dir + gameManager
Merge remote-tracking branch 'origin/jonas' into jonas

Conflicts:
	Revenge_of_the_Penguins/aicontrol.cpp
keine Ahnung