teste
Merge branch 'master' of https://github.com/JorgeCataldo/puc

Conflicts:
	Quicksort/phytonschool.py