1
Merge branch 'master' of github.com:lauromoraes/redes

Conflicts:
	calc.pyc
	input.txt