Merge
Merge branch 'master' of github.com:vtomasr5/distribuits

Conflicts:
	simulacion/simulacion.py
Merge conflicts