index modificado
Merge branch 'victor' of https://github.com/rebearteta/pruebaOne into victor

Conflicts:
	public/index.php

	modified:   index.php