Added scene to test polish stuff called Polish Test. Tested different colliders for the players
Merge pull request #5 from kedromelon/Matt'sBranch

Matt's branch
Merge pull request #6 from kedromelon/Matt'sBranch

Changed Goal
added dashatgoal.cs and updated player script
Merge branch 'master' into noah_develop

Conflicts:
	Assets/Scenes/Showcase-3.unity
added dash at opposing players
Merge pull request #7 from kedromelon/noah_develop

added additional dashes
Merge branch 'master' into Will_develop

Conflicts:
	Assembly-CSharp.pidb
	Assets/Scenes/Matt's scene Revamp.unity
Merged Master into my branch, added paint scripts to paint the ball the color of the team that hit it, and paint the goal the color of the ball. Tied that into a scoring system that gives the team who "controls" the goal (i.e. the goal is painted that team's color) points over time, and made a temporary gui that showed the scores going up. Finally, added 3 spheres around each player that disappear when their corresponding dash is on cooldown (they are color coordinated with the buttons on the xobx controller that correspond to that dash).
Gave each dash indicator it's own material, instead of reusing the player materials, so they can be manipulated for polish
Took colliders off of the dash cooldown indicators
changed the dash indicators materials from diffuse to sprites/default to make them look like flat circles instead of spheres
Merge pull request #8 from kedromelon/Will_develop

Will develop
audiomanager and sounds
Merge branch 'master' into noah_develop
added new stuff in will’s scene, merged stuff
added a temporary win condition. When the score reaches a certain number (assignable in the inspector in the willGoalPaint script on the goal), the scores for the two teams freeze and a text coming up saying that team x won.
Merge branch 'master' into Will_develop and redid win condition + text

Conflicts:
	Assets/Scenes/willscene.unity
whoops, fixed some prefabs
Pulled back the camera so we can see the whole arena and the ball/goal doesn't get lost in the bottom part.