Final version

Final version without PlayerTest.java