jk
Merge branch 'master' of https://github.com/Odenthma/WBA2_P2.git

Conflicts:
	geocatching/src/User.xsd