Implemented Person class
Fix merge conflicts