consultas corregidas
Merge remote-tracking branch 'origin/master'

Conflicts:
	calificar.php
Merge branch 'master' of https://github.com/chazter92/bOut

Conflicts:
	ratings.php