algoritmo quase completo
Merge branch 'master' of github.com:eaglebh/ftc_tp1

Conflicts:
	src/main/java/tp1/App.java