MUCHA MAGIA
Merge branch 'master' of https://github.com/nloreti/infovis-final

Conflicts:
	barras.php
	comparacion.php
	tiempo.php