hft memoria_pregrado changes
Merge branch 'master' of github.com:jantogni/memoria