Merge pull request #1 from Armando1vida/master

asd
cambio 1
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php
Merge origin/master

Conflicts:
	index.php