Added Player class
merge
merge 2