Updated Player.java since serialize() was deleted somehow
Merge branch 'meghan'