Test
Merge branch 'master' of https://github.com/normandanielmq/ProyectoTest

Conflicts:
	ServicioWeb/appTest/db/schema.rb