worked on Level
merge
merging again
Merge remote-tracking branch 'origin/master' into LevelDesignBranch

Conflicts:
	BlendFiles/City Stuff/Kran/Ohne Textur/kran1.blend
	Thalos/Assets/Meshes/Guardian.blend
	Thalos/Assets/Meshes/Guardian.blend1
	Thalos/Assets/Prefabs/Bullet_Standard.prefab
	Thalos/Assets/Prefabs/uhr2.prefab
	Thalos/Assets/Scenes/Debug_Scenes/Debug_Scene_Martin.unity
	Thalos/Assets/Scenes/GameScenes/scene_01.unity
	Thalos/Assets/Scripts/PlayerControl/PlayerInputManager.cs
	Thalos/Assets/Scripts/PlayerControl/RotateWithGazeInput.cs
	Thalos/Assets/setPositionHeathbar.cs
add ColisionDetection
updated Collider
restore LampTexture
Fixed missing Prefabs
worked on Level
add Gaze&Shoot
Merge branch 'LevelDesignBranch' of https://github.com/Rameos/GIG_game into LevelDesignBranch
worked on second housingarea in Level
worked on third housingarea in Level
started working on market in Level
worked on market in Level
Fixed Some Bugs
Update Player
started cleaning up Level
init alchemy system
Chenged Terrain