primer commit, pepe
added aux.data
conflicto solucionado
Merge remote-tracking branch 'origin/devel' into devel