reports sin terminar
Merge branch 'master' of github.com:gitdb2/arqliv-dominio

Conflicts:
	src/main/java/uy/edu/ort/arqliv/obligatorio/dominio/Arrival.java