Uncommited?
Merge branch 'master' of https://github.com/ernest21/ConstrcionDeSoftwaresemaforo

Conflicts:
	intercesion.py