Added Player class
merge conflicts solved