Fixed scene
pull from will_develop

Conflicts:
	Assets/Scenes/Matt's scene Revamp.unity
Started score counter script
Merge branch 'master' into noah_develop

Conflicts:
	Assets/6by7.meta
added 6by7.meta to .gitignore; fixed controller jumping repeat bug
Merge branch 'master' into noah_develop
added dash scripts; edited player controls: WASD/Q-dash/Lshift-jump + IJKL/U-dash/Rshift-jump
Merge branch 'master' into Matt'sBranch

Conflicts:
	Assets/Scenes/Matt's scene Revamp.unity
-Changed the controller and Bcontrollers to P1Controller and P2 Controller respectively
-Created the Showcase-Protype scene for use in class tomorrow. The level is a decagon (10 sides) and has walls, a roof, 2 players, and a ball
-Fixed the ballreturn script for the new level
-Fixed the jump height to 20 instead of 100 for the controller scripts
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
somehow players and stuff got weird; fixed it
added test scene for controller; created new player scripts