prueba de escudo en dropbox
dfs
Merge branch 'master' of https://github.com/ACNGAMES/ACNGamesDemo

Conflicts:
	views/page.ejs
Se agregan los procesos cron reminderP.php y deleteAccountsP.php
eliminado
acento
asd
Merge branch 'master' of https://github.com/ACNGAMES/ACNGamesDemo