Entity

Entity Implementation
Player Class Update

Player class updated to account for entity
Clear old commented code
Conflict Fix