Trepitja ubuntu
Merge branch 'master' of https://github.com/joan-pons/HelloWorld.git

Conflicts:
	HelloWorld/src/paquet/Adeu.java
#