Terminado
d
Merge remote-tracking branch 'origin/master'

Conflicts:
	HDT6/src/Main.class
	HDT6/src/Main.java