renamed test scene to avoid overwrite
Merge branch 'master' into noah_develop

Conflicts:
	Assets/Scenes/noah test scene.unity
switched to previous player and ball prefabs, using goblin hovercraft models
changed dash speed, upgraded to unity 4.3
changed rigidbody collision detection to continuous w/ interpolation - should prevent balls/players going through walls of arena
switched to capsule colliders
created maxvelocity script, applied to player and ball prefabs; added drag on ball
deleted cube players; decreased player and ball kick forces
updated player colliders with flat front
Added a better dash to dash the player in the direction of the ball, added a text to count how many times the ball has been juggled

Merge branch 'master' into Will_develop

Conflicts:
	Assembly-CSharp.pidb
	Assets/Scenes/Matt's scene Revamp.unity