Server de test CORRER RAKE DB:MIGRATE!
Merge branch 'master' of https://github.com/normandanielmq/ProyectoTest

Conflicts:
	ServicioWeb/appTest/.idea/workspace.xml
	ServicioWeb/appTest/config/routes.rb