Made a bunch of changes to the ray shooting stuff
i just did git add to the merge confilct, no idea if this worked out or not, but version control opMerge remote-tracking branch 'origin/master'

Conflicts:
	Unity Project/Assets/Standard Assets/Character Controllers/Sources/PrototypeCharacter/Materials/Constructor-09 - Default.mat.meta