Fixed scene
Started score counter script
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
Merge branch 'master' into noah_develop

Conflicts:
	Assets/Scenes/noah test scene.unity