se agregaron archivos
Merge branch 'master' of https://github.com/penajose10/ticketes
Merge branch 'master' of https://github.com/penajose10/ticketes
Merge branch 'master' of https://github.com/penajose10/ticketes
cambios alejandro
wqrge branch 'master' of https://github.com/penajose10/ticketes

Conflicts:
	index.php
	view/templates/index.tpl
	view/templates_c/101f1626e22514a16d5eb11e83511bb2ec2d8c0e.file.index.tpl.php