return s;
    }

<<<<<<< HEAD
    public void drawPopularEquipment(Graphics2D g2) {
        if (team == null || ds == null)
            return;
        ArrayList components = team.equals(Team.A) ? ds.getATeamComponents() : ds.getBTeamComponents();
        String popularWeaponString = "None";
=======
    public void drawPopularEquipment(Graphics2D g2){
    	if(team == null || ds == null) return;
    	ArrayList components = team.equals(Team.A) ? new ArrayList(ds.getATeamComponents()) : new ArrayList(ds.getBTeamComponents());
    	String popularWeaponString = "None";
>>>>>>> 4e341c31db05343fe0facd685f177d6604b0d19f
        String popularArmorString = "None";
        String popularMiscString = "None";

        return s;
    }


    public void drawPopularEquipment(Graphics2D g2){
    	if(team == null || ds == null) return;
    	ArrayList components = team.equals(Team.A) ? new ArrayList(ds.getATeamComponents()) : new ArrayList(ds.getBTeamComponents());
    	String popularWeaponString = "None";
        String popularArmorString = "None";
        String popularMiscString = "None";