did a different scoring system, changed the starting positions of players
Merge branch 'master' into Will_develop

Conflicts:
	Assets/Scenes/willscenetest.unity
Merge branch 'master' into Will_develop

Conflicts:
	Assets/Scenes/willscenetest.unity
Merge branch 'master' into Will_develop
Merge branch 'master' into Will_develop. Added a countdown when the game starts. Froze movement for the players during the countdown and after one team wins

Conflicts:
	Assets/Scenes/test.unity
Merge branch 'master' into Will_develop

Conflicts:
	Assets/Scenes/willscene.unity
Added the countdown and movement freezing stuff to the new arena
Merge branch 'master' into noah_develop