script base de datos
a mi manera
FUCK
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
ALO
Merge branch 'master' of https://github.com/YaninaGaitero/JSF

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties