agregar,eliminar y modificar flores completado
agregar eliminar y modificar flores
Merge remote-tracking branch 'origin/master'

Conflicts:
	Floristeria/admin/agregarflor.php