**<<<<<<< .mine**
<?php

/**
* Class Person
*
*/
class Person {

        var $id;
        var $firstname;
        var $lastname;
        var $address;
        var $city;

        function __construct() {

        }
}
?>**=======**
<?php

/**
* Class Person
*
*/
class Person {

        var $id;
        var $prenom;
        var $nomfamille;
        var $adresse;
        var $ville;

        function __construct() {
        }
}
?**>>>>>>>> .r3**