Merge remote-tracking branch 'origin/JS' into JS

Conflicts:
	Practica3.py