Arreglado
Merge branch 'master' of https://github.com/baicunko/TallerIntegracion3

Conflicts:
	Gemfile.lock
	db/schema.rb