Added Person class files and methods
fixed merge conflicts