nop
Merge branch 'master' of https://github.com/MaxChaza/Localhost

Conflicts:
	nbproject/private/private.xml
ok
n
ok
Merge branch 'master' of https://github.com/MaxChaza/Localhost

Conflicts:
	TP1/counter/counterContact.txt
	TP1/counter/counterService.txt