modificacio projecte 2
modificacio misma linea projecte2
Merge branch 'master' of https://github.com/rrodriguez1/repositorinou

Conflicts:
	FRASELETRAS.java