Revert "Mi primer cambio"
Merge branch 'josuecode'
Merge branch 'josuecode'
Merge branch 'josuecode'
Merge branch 'josuecode'
comentario

comentario
Se ignoran archivos de sistema

eso
Merge branch 'master' of github.com:josuemeza/dristill

Conflicts:
	.gitignore
	assets/.DS_Store
Conflictos de merch solucionados
Merge branch 'josuecode'

Conflicts:
	.gitignore
	assets/.DS_Store
Merge branch 'josuecode'

Conflicts:
	.gitignore
	assets/.DS_Store
	views/registro.php
Solución en conflicto de registro
Formulario nuevo evento
Formulario perfil v2
Formulario v2.01
Merge branch 'maxcode'

Conflicts:
	views/perfil.php
Merge branch 'master' of github.com:josuemeza/dristill
Merge branch 'josuecode'
Merge branch 'master' into josuecode