Added a new person
Merge origin/master

Person p5 conflicted, is now solved