mike
Merge branch 'master' of https://github.com/OzwaldoC8/Conxca-8D

Conflicts:
	Index_publico.php
	Layout/juegos.html
	Layout/registrom.php
	Main/Index.php