files msg
cn
Merge branch 'master' of https://github.com/encuentros/Codigos

Conflicts:
	conexion.php