index test
Descarga de repositorio a pc 10 -03-2014
Merge branch 'master' of https://github.com/daosgava/proyectoSM

Conflicts:
	application/logs/log-2014-03-06.php