auto dev server commit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect
Merge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect

Conflicts:
	Gemfile
eMerge branch 'master' of https://github.com/dmorenodev/CuboLedsproyect

Conflicts:
	Gemfile
cambios de mysql