test de conflit zdav
test de conflit sam
Merge pull request #1 from samoth93/test2

Test2
Fix conflict in nuked.php with pull request #2 in #1
Merge branch 'test3'

Conflicts:
	nuked.php