private xml
error 30-1
Merge branch 'master' of https://github.com/jvcerver/DijulSL

Conflicts:
	nbproject/private/private.xml