added more things for the player class and its dependencies
fixed merge conflict in devcardtype
organized the player class, added more functionality to it and its dependencies