change gitignore bien hecho
wer
reservas

trabajando en jsp
Merge branch 'Charlie'

Conflicts:
	nbproject/private/private.xml
Merge branch 'maria'

Conflicts:
	nbproject/private/private.properties
cambios .gitignore