Merge branch 'master' of https://gitlab.fing.edu.uy/martin.mendez/proygrado

MateFun/src/MateFun.hs

backend/matefun/WebContent/favicon.ico

backend/matefun/WebContent/index.html

...matefun/bin/target/classes/edu/proygrado/binarios/MateFun

.../matefun/src/main/java/edu/proygrado/ejb/ArchivosEJB.java

...end/matefun/src/main/java/edu/proygrado/ejb/LoginEJB.java

frontendAngular4/src/app/login/login.component.html

...r4/src/app/shared/components/header/header.component.html

...r4/src/app/shared/components/header/header.component.scss

.../src/app/shared/components/sidebar/sidebar.component.html