added some ingame functionality for players and enemies
changed merge conflicts with Josh