Working on collisions
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/PlayerScript.cs
server collision trigger working
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Prefabs/Player.prefab