Merge remote-tracking branch 'origin/master'

Conflicts:
	HDT3/src/Archivo.java
Merge branch 'master' of https://github.com/Diego13280/HDT3