Merge remote-tracking branch 'origin/master' into Canvis

Conflicts:
	holacarallot.txt
Merge branch 'Canvis' of https://github.com/dam-1415-g2/prova into Canvis

Conflicts:
	holacarallot.txt