Cambios 2

ñaslkdjf
Merge branch 'master' of https://github.com/PabloArty/NVIBA-Web

Conflicts:
	NVIBA_WEB Final/css/stile.css
	NVIBA_WEB Final/index.html
	NVIBA_WEB Final/stylus/stile.styl