hj
Merge origin/master

Conflicts:
	src/lapr1/Principal.java
Condensação acima da diagonal principal incompleto
...
...fix ...
Merge origin/master

Conflicts:
	src/lapr1/Principal.java
Merge origin/master

Conflicts:
	src/lapr1/Principal.java