Merge branch 'altura' of gitlab.c3sl.ufpr.br:vsbc14/enchente into altura

 Conflicts:
	tests/runTests.sh
4 jobs for altura in 7 minutes and 7 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #9876
ubuntu
h1

00:05:40

passed #9877
ubuntu
h2

00:05:36

passed #9878
ubuntu
h4

00:07:06

passed #9879
ubuntu
h6

00:05:57