test
change 41
change41
Merge branch 'master' of
https://github.com/pauliewallie/WorldCupComp.git

Conflicts:
	WorldCupComp/WorldCupComp-war/pom.xml
Merge branch 'master' of https://github.com/pauliewallie/WorldCupComp.git
Adding new HTML, CSS and JS files for client webapp