se modifica Makefile
Merge branch 'master' of github.com:gabrielformica/proy1-ci4835