Art shit und so
materials
some switches bla
zh
sd
ghk
adf
Merge branch 'origin/Programmer'
Merge branch 'origin/master'

Conflicts:
	TestProjekt/Assets/vuiawrvk.cs
Merge branch 'origin/master'

Conflicts:
	TestProjekt/Assets/vuiawrvk.cs
Merge branch 'origin/Art'