Revert "Revert "Merge branch 'master' of https://github.com/IESMonterroso/intranet""

This reverts commit 39eaec37e0c9b9d1450261c5d664d68d1900827e.