mi Commit
Merge branch 'master' of
https://github.com/JackPanzer/msgccg1_servidor.git

Conflicts:
	mgcssg1_servidor/index.php