adding files
merging Player.java