Removed subclassing from Player - ended up removing User.java. Now we just use Player.java for everything