Ultimo push del css
Added background images
colisiones Merge branch 'master' of https://github.com/gonzalezf/Tarea1

Conflicts:
	build/web/WEB-INF/classes/controlador/login.class
	nbproject/private/private.properties