Session
Merge remote-tracking branch 'origin/master'

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