Added a  Person
Merge origin/master

Conflicts:
	src/slet/SLET.java