a
Merge branch 'miguel' of https://github.com/mgasconb/proyecto into miguel

Conflicts:
	nbproject/private/private.xml