added Demario classes and merged the player's class