version renobado
inicio 2
Merge branch 'master' of https://github.com/GrijalvaMarco/EED1

Conflicts:
	inicio.php
	principal.php
	validar.php