deleted:    Hola.java
Merge branch 'master' of https://github.com/berna87/Java

Conflicts:
	Hola1.java

	new file:   Hola1.java
Merge branch 'master' of https://github.com/berna87/Java

borrado de fichero
	new file:   Hola.java