graphic merge test
Merge branch 'master' of https://github.com/Janin-K/SG

Conflicts:
	Uebung3/Assets/Uebung3.unity