Cambio a get
Modificación
Actualizador
Merge remote-tracking branch 'origin/master'

Conflicts:
	Floristeria/posts/emailcheck.php
Merge branch 'master' of https://github.com/LuisEsc/NewRepo