laiaisern!!
hh
Merge branch 'master' of https://github.com/laiaisern/mati.git
modifico quan ja han modificat abans
Merge remote-tracking branch 'origin/master'

Conflicts:
	mati/src/mati/Lisern3.java
arreglat