Merge pull request #15 from torgeha/tjBranch

Tj branch
Updated Player collision
Updated Player