Added screen shake on a bunch of different collision. Needs to be tested/tuned with 4 people to see if it's too much. Tweaked the numbers for the ball colliding with the wall so the screen shakes more with higher impact collisions. This might be a bit too much.
POLISH
Merge branch 'master' into Will_develop. Added screen shake on player/player collisions, player/ball, ball/goal, ball/wall

Conflicts:
	Assets/Scripts/willGoalPaint.cs
Merge branch 'master' into Will_develop

Conflicts:
	Assets/Scenes/noahscene.unity
Fixed the drift on screen shake by adding a returnCameraPosition Vector3 variable to all the screen shake objects
more POLISH
fixed problem with neutral material switching on goal
Added team-specific particle effects for scoring and renamed the particle systems in goal paint script to scoreParticle1 and 2. Made it so the color sort of drips off the goal when a team scores. Also made a tweaked version for when a team starts the scoring called hitParticle1 and 2 but commented it out because I don't like how it looks. Added a very low amount of screen shake for when the player hits the goal.
Merge branch 'master' into Will_develop
merged with master and tweaked the duration of the scoring particle system
made floor prefab
Merge branch 'noah_develop' of https://github.com/kedromelon/modding_project into noah_develop

Conflicts:
	Assets/Scenes/noahscene.unity
fixed floor, changed some player settings
Merge branch 'master' into Matt'sBranch

Conflicts:
	Assembly-UnityScript-Editor-vs.unityproj
	Assembly-UnityScript-Editor.unityproj
	Assembly-UnityScript-firstpass-vs.unityproj
	Assembly-UnityScript-firstpass.unityproj