Formulario perfil v2
Merge branch 'maxcode'

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