Merge al repositorio remoto
Merge branch 'master' of https://github.com/JanoSoto/PBD-Winner-2

Conflicts:
	log/development.log
Merge por el development.log
Merge branch 'master' of https://github.com/JanoSoto/PBD-Winner-2

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/1cf569f5a0bf33b13b77667e2cf5d9a5
	tmp/cache/assets/development/sprockets/21bd6ffc42234f5c6f647cf2a2197b44
	tmp/cache/assets/development/sprockets/6b3b1bfdacd83f9fbd5b154311a9fbb2
	tmp/cache/assets/development/sprockets/a4359fea954d84e3278ae22aba51d1c0
	tmp/cache/assets/development/sprockets/ceb4f3da8b2767c787fed2fd9d2927cf
	tmp/cache/assets/development/sprockets/e0967fb530d9c1533c11938c8b77053b
Jueces registrados. Falta vinculación con una competencia
Merge branch 'master' of https://github.com/JanoSoto/PBD-Winner-2

Conflicts:
	db/schema.rb
	log/development.log