Merge origin/master

Conflicts:
	src/lapr1/Calculo.java