clave al root
ingresar a base de datos
Merge branch 'master' of https://github.com/openmrmobile/openmrmobile

Conflicts:
	application/config/database.php
	application/models/login_usuario.php
se agrego carpeta de documentacion