Gfx + JJ WORLDSTAR
Merge commit '824500003bc6f80312d167bf823d2fa26219f4a5'

Conflicts:
	Assets/Prefabs/Beam.prefab
	Assets/Prefabs/Player1.prefab
	Assets/Prefabs/Player2.prefab
	Assets/Scenes/main.unity
	Assets/Scripts/Beam.cs
	ProjectSettings/TagManager.asset