local
Merge branch 'master' of git@github.com:JurdoX/Home_repo.git

Conflicts:
	JSF-Examples/src/main/java/com/jurdox/Person.java
	JSF-Examples/src/main/webapp/Registration.xhtml