no conflicto
si sa liat
Merge branch 'Canvis' of https://github.com/dam-1415-g2/prova

Conflicts:
	holacarallot.txt