Added a Person (Hans)
Merge origin/master

Conflicts: Added Person