test 35
Merge branch 'master' of
https://github.com/pauliewallie/WorldCupComp.git

Conflicts:
	WorldCupComp/WorldCupComp-war/src/main/webapp/jsp/register.jsp