Fix de floats, parametrizacion de valores

Y vacas
Merge remote-tracking branch 'origin/master'

Conflicts:
	tex/performanceStudent.tex