added player code
merged conflicts